Google Git
Sign in
chromium / chromium / src / tools / 3ab4b2c831565a789a760dcdd8645745c9e9872e
commit3ab4b2c831565a789a760dcdd8645745c9e9872e[log] [tgz]
authorDanan S <danan@chromium.org>Tue Jun 25 23:08:48 2019
committerCommit Bot <commit-bot@chromium.org>Tue Jun 25 23:08:48 2019
treecf3b15c8d6b16047301209106dcdd910729015ae
parent48d513fc424787ee74dfec1e2e9cc230bc48b33e [diff]
Merge ChromeOSAddSupervision flag into ChromeOSParentalControlsSettings

Also added to enable-parental-controls-settings to chrome://flags

Bug: 927957
Change-Id: Ie720ee20b5c601514d312831fd03b582667acebc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1669890
Commit-Queue: Danan S <danan@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#672305}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 749399c975fb2c1f9869d94ecd91b43aadd98f38
1 file changed
tree: cf3b15c8d6b16047301209106dcdd910729015ae
  1. accessibility/
  2. android/
  3. binary_size/
  4. bisect_repackage/
  5. cfi/
  6. check_ecs_deps/
  7. checkbins/
  8. checklicenses/
  9. checkperms/
  10. checkteamtags/
  11. chrome_extensions/
  12. chrome_proxy/
  13. clang/
  14. code_coverage/
  15. compile_test/
  16. coverity/
  17. cr/
  18. cros/
  19. cygprofile/
  20. cygprofile_win/
  21. determinism/
  22. dromaeo_benchmark_runner/
  23. dump_process_memory/
  24. emacs/
  25. find_runtime_symbols/
  26. flags/
  27. flakiness/
  28. fuchsia/
  29. gdb/
  30. generate_library_loader/
  31. generate_shim_headers/
  32. generate_stubs/
  33. git/
  34. gn/
  35. grit/
  36. gritsettings/
  37. idl_parser/
  38. imagediff/
  39. infra/
  40. ipc_fuzzer/
  41. json_comment_eater/
  42. json_schema_compiler/
  43. json_to_struct/
  44. linux/
  45. lldb/
  46. luci-go/
  47. mac/
  48. mb/
  49. md_browser/
  50. measure_page_load_time/
  51. media_engagement_preload/
  52. memory/
  53. memory_inspector/
  54. metrics/
  55. msan/
  56. oopif/
  57. origin_trials/
  58. page_cycler/
  59. perf/
  60. polymer/
  61. protoc_wrapper/
  62. python/
  63. real_world_impact/
  64. resources/
  65. security/
  66. site_compare/
  67. stats_viewer/
  68. strict_enum_value_checker/
  69. sublime/
  70. symsrc/
  71. tcmalloc/
  72. tests/
  73. traceline/
  74. traffic_annotation/
  75. translation/
  76. ubsan/
  77. usb_gadget/
  78. v8_context_snapshot/
  79. valgrind/
  80. variations/
  81. vim/
  82. vscode/
  83. web_bluetooth/
  84. web_dev_style/
  85. win/
  86. xdisplaycheck/
  87. bash-completion
  88. bisect-builds.py
  89. bisect_test.py
  90. boilerplate.py
  91. check_git_config.py
  92. check_grd_for_unused_strings.py
  93. clang-format-js
  94. DEPS
  95. diagnose-me.py
  96. gypv8sh.py
  97. include_tracer.py
  98. ipc_messages_log.py
  99. licenses.py
  100. make-gtest-filter.py
  101. multi_process_rss.py
  102. nocompile_driver.py
  103. omahaproxy.py
  104. OWNERS
  105. perry.py
  106. remove_duplicate_includes.py
  107. remove_stale_pyc_files.py
  108. roll_webgl_conformance.py
  109. run-swarmed.py
  110. safely-roll-deps.py
  111. sort-headers.py
  112. sort_sources.py
  113. uberblame.py
  114. unused-symbols-report.py
  115. yes_no.py