• Home
  • History
  • Annotate
  • only in /external/chromium_org/chrome/browser/ui/webui/options/
History log of /external/chromium_org/chrome/browser/ui/webui/options/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 08-Dec-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
ebsite_settings_handler.cc
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
ontent_settings_handler.cc
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
hromeos/internet_options_handler.cc
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
ore_options_handler.cc
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
rowser_options_handler.cc
anage_profile_handler.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
dvanced_options_utils_linux.cc
utofill_options_handler.cc
utomatic_settings_reset_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_handler.cc
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/consumer_management_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/date_time_options_handler.cc
hromeos/display_options_handler.cc
hromeos/display_overscan_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/internet_options_handler_strings.cc
hromeos/internet_options_handler_strings.h
hromeos/keyboard_handler.cc
hromeos/pointer_handler.cc
hromeos/proxy_handler.cc
hromeos/shared_options_browsertest.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ore_options_handler.cc
ore_options_handler.h
reate_profile_handler.cc
asy_unlock_handler.cc
ont_settings_handler.cc
andler_options_handler.cc
elp_overlay_handler.cc
ome_page_overlay_handler.cc
mport_data_handler.cc
anguage_dictionary_overlay_handler.cc
anguage_options_handler.cc
anguage_options_handler_common.cc
anguage_options_interactive_uitest.cc
anage_profile_browsertest.js
anage_profile_handler.cc
edia_devices_selection_handler.cc
ptions_browsertest.js
ptions_handlers_helper.cc
ptions_ui.cc
ptions_ui_browsertest.cc
assword_manager_handler.cc
epper_flash_content_settings_utils.h
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
earch_engine_manager_handler.cc
ettings_format_browsertest.js
tartup_pages_handler.cc
upervised_user_create_confirm_handler.cc
upervised_user_import_handler.cc
upervised_user_learn_more_handler.cc
ebsite_settings_handler.cc
ebsite_settings_handler.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
utofill_options_handler.cc
utofill_options_handler.h
utofill_options_handler_unittest.cc
rowser_options_browsertest.js
rowser_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/consumer_management_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler_strings.cc
hromeos/proxy_handler.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ont_settings_handler.cc
anguage_options_interactive_uitest.cc
anage_profile_browsertest.js
anage_profile_handler.cc
ptions_ui.cc
assword_manager_handler.cc
tartup_pages_handler.cc
ebsite_settings_handler.cc
ebsite_settings_handler.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
rowser_options_browsertest.js
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
hromeos/accounts_options_browsertest.cc
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/consumer_management_handler.cc
hromeos/consumer_management_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/proxy_handler.cc
hromeos/shared_options_browsertest.cc
hromeos/user_image_source.cc
ontent_settings_handler.cc
ookies_view_handler.cc
asy_unlock_handler.cc
asy_unlock_handler.h
andler_options_handler.cc
elp_overlay_handler.cc
elp_overlay_handler.h
ome_page_overlay_handler.cc
mport_data_handler.cc
anguage_options_browsertest.js
anage_profile_browsertest.js
anage_profile_handler.cc
edia_devices_selection_handler.cc
edia_devices_selection_handler.h
ptions_handlers_helper.cc
ptions_ui.cc
ptions_ui_browsertest.cc
assword_manager_handler.cc
eset_profile_settings_handler.cc
tartup_pages_handler.cc
upervised_user_create_confirm_handler.cc
upervised_user_import_handler.cc
ebsite_settings_handler.cc
ebsite_settings_handler.h
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
utofill_options_handler.cc
utomatic_settings_reset_handler.cc
rowser_options_handler.cc
ertificate_manager_browsertest.cc
hromeos/accounts_options_browsertest.cc
hromeos/accounts_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/consumer_management_handler.cc
hromeos/consumer_management_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
hromeos/shared_options_browsertest.cc
hromeos/user_image_source.cc
hromeos/user_image_source.h
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ore_options_handler.cc
reate_profile_handler.cc
andler_options_handler.cc
ome_page_overlay_handler.cc
anguage_options_handler_common.cc
anage_profile_browsertest.js
anage_profile_handler.cc
ptions_browsertest.js
ptions_ui.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
tartup_pages_handler.cc
upervised_user_create_confirm_handler.cc
upervised_user_import_handler.cc
upervised_user_import_handler.h
upervised_user_learn_more_handler.cc
ebsite_settings_handler.cc
ebsite_settings_handler.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EPS
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
hromeos/accounts_options_browsertest.cc
hromeos/change_picture_options_handler.cc
hromeos/consumer_management_handler.cc
hromeos/consumer_management_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/internet_options_handler_strings.cc
hromeos/internet_options_handler_strings.h
hromeos/shared_options_browsertest.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
reate_profile_handler.cc
reate_profile_handler.h
ont_settings_handler.cc
ont_settings_handler.h
ome_page_overlay_handler.cc
anage_profile_handler.cc
anaged_user_create_confirm_handler.cc
anaged_user_create_confirm_handler.h
anaged_user_import_handler.cc
anaged_user_import_handler.h
anaged_user_learn_more_handler.cc
anaged_user_learn_more_handler.h
ptions_ui.cc
ptions_ui.h
references_browsertest.cc
earch_engine_manager_handler.cc
tartup_pages_handler.cc
upervised_user_create_confirm_handler.cc
upervised_user_create_confirm_handler.h
upervised_user_import_handler.cc
upervised_user_import_handler.h
upervised_user_learn_more_handler.cc
upervised_user_learn_more_handler.h
ebsite_settings_browsertest.js
ebsite_settings_handler.cc
ebsite_settings_handler.h
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
rowser_options_handler.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
andler_options_handler.cc
ome_page_overlay_handler.cc
eset_profile_settings_handler.cc
tartup_pages_handler.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
WNERS
rowser_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/shared_options_browsertest.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
ore_options_handler.cc
reate_profile_handler.cc
reate_profile_handler.h
andler_options_handler.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_import_handler.cc
anaged_user_import_handler.h
ptions_browsertest.js
ptions_handlers_helper.cc
ptions_ui_browsertest.cc
references_browsertest.cc
earch_engine_manager_handler.cc
tartup_pages_handler.cc
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_handler.cc
hromeos/accounts_options_browsertest.cc
hromeos/accounts_options_handler.cc
hromeos/internet_options_handler.cc
lear_browser_data_browsertest.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
ookies_view_handler.cc
anguage_options_handler_common.cc
ptions_browsertest.h
ptions_browsertest.js
ptions_ui_browsertest.cc
references_browsertest.cc
eset_profile_settings_handler.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
utofill_options_browsertest.js
utofill_options_handler.cc
rowser_options_browsertest.js
rowser_options_handler.cc
hromeos/accounts_options_browsertest.cc
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_browsertest.js
hromeos/change_picture_options_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/display_overscan_handler.cc
hromeos/display_overscan_handler.h
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/keyboard_handler.cc
hromeos/keyboard_handler.h
hromeos/shared_options_browsertest.cc
hromeos/user_image_source.cc
ontent_settings_handler.cc
ore_options_handler.cc
ont_settings_handler.cc
andler_options_handler.cc
anage_profile_handler.cc
anage_profile_handler.h
ptions_browsertest.js
ettings_format_browsertest.js
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
dvanced_options_utils_win.cc
utofill_options_browsertest.js
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
hromeos/bluetooth_options_browsertest.js
hromeos/date_time_options_handler.cc
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
ontent_settings_exception_area_browsertest.js
ontent_settings_handler.cc
ont_settings_browsertest.js
mport_data_handler.cc
anage_profile_browsertest.js
anage_profile_handler.cc
ptions_browsertest.js
ptions_ui.cc
assword_manager_handler.cc
earch_engine_manager_handler.cc
ettings_format_browsertest.js
tartup_page_list_browsertest.js
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
utofill_options_browsertest.js
rowser_options_handler.cc
ertificate_manager_browsertest.js
hromeos/accounts_options_browsertest.js
hromeos/change_picture_options_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/date_time_options_browsertest.js
hromeos/date_time_options_handler.cc
hromeos/date_time_options_handler.h
hromeos/display_options_handler.cc
hromeos/user_image_source.cc
ontent_options_browsertest.js
ontent_settings_exception_area_browsertest.js
ontent_settings_handler.cc
ookies_view_browsertest.js
dit_dictionary_browsertest.js
ont_settings_browsertest.js
mport_data_handler.cc
mport_data_handler.h
anguage_options_dictionary_download_browsertest.js
anage_profile_handler.cc
anage_profile_handler.h
ptions_ui.cc
ptions_ui_browsertest.cc
assword_manager_browsertest.js
rofile_settings_reset_browsertest.js
earch_engine_manager_browsertest.js
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
utofill_options_browsertest.js
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
hromeos/OWNERS
hromeos/internet_options_handler.cc
hromeos/internet_options_handler_strings.cc
hromeos/internet_options_handler_strings.h
lear_browser_data_browsertest.cc
lear_browser_data_handler.cc
ore_options_handler.cc
ont_settings_handler.cc
ome_page_overlay_handler.cc
ptions_ui_browsertest.cc
ptions_ui_browsertest.h
references_browsertest.cc
references_browsertest.h
tartup_pages_handler.cc
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
hromeos/accounts_options_browsertest.cc
hromeos/core_chromeos_options_handler.cc
hromeos/keyboard_handler.cc
ontent_settings_handler.cc
reate_profile_handler.cc
anage_profile_handler.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
rowser_options_handler.cc
rowser_options_handler.h
hromeos/accounts_options_browsertest.cc
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
ore_options_handler.cc
anage_profile_browsertest.js
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_import_handler.cc
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_ui.cc
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
dvanced_options_utils_linux.cc
rowser_options_handler.cc
rowser_options_handler.h
hromeos/change_picture_options_handler.cc
eolocation_options_handler.cc
anage_profile_handler.cc
anaged_user_create_confirm_handler.cc
anaged_user_import_handler.cc
ptions_ui_browsertest.cc
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
rowser_options_handler.cc
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
hromeos/bluetooth_options_handler.cc
hromeos/bluetooth_options_handler.h
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/guest_mode_options_ui_browsertest.cc
lear_browser_data_handler.cc
ore_options_handler.cc
ore_options_handler.h
andler_options_handler.cc
anaged_user_create_confirm_handler.cc
anaged_user_import_handler.cc
anaged_user_import_handler.h
ptions_ui.cc
ptions_ui.h
ptions_ui_browsertest.cc
ptions_ui_browsertest.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
rowser_options_handler.cc
rowser_options_handler.h
ontent_settings_handler.cc
ontent_settings_handler.h
ore_options_handler.cc
ont_settings_handler.cc
anguage_options_handler_common.cc
anaged_user_import_handler.cc
anaged_user_import_handler.h
earch_engine_manager_handler.cc
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
utofill_options_handler.cc
utomatic_settings_reset_handler.cc
rowser_options_browsertest.js
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/OWNERS
hromeos/bluetooth_options_handler.cc
hromeos/bluetooth_options_handler.h
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_options_handler.cc
ontent_settings_handler.cc
ore_options_handler.cc
anguage_options_browsertest.js
anguage_options_handler_common.cc
anage_profile_handler.cc
anaged_user_import_handler.cc
anaged_user_import_handler.h
edia_galleries_handler.cc
ptions_ui.cc
ptions_ui_browsertest.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
utofill_options_handler.cc
utomatic_settings_reset_handler.cc
utomatic_settings_reset_handler.h
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/accounts_options_browsertest.cc
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_options_handler.cc
hromeos/display_overscan_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
hromeos/keyboard_handler.h
hromeos/pointer_handler.cc
hromeos/pointer_handler.h
hromeos/proxy_handler.cc
hromeos/shared_options_browsertest.cc
hromeos/stats_options_handler.cc
hromeos/user_image_source.cc
hromeos/user_image_source.h
lear_browser_data_handler.cc
lear_browser_data_handler.h
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ore_options_handler.cc
ore_options_handler.h
reate_profile_handler.cc
ont_settings_handler.cc
ont_settings_handler.h
eolocation_options_handler.cc
eolocation_options_handler.h
andler_options_handler.cc
andler_options_handler.h
mport_data_handler.cc
anguage_dictionary_overlay_handler.cc
anguage_options_handler.cc
anguage_options_handler_common.cc
anguage_options_handler_unittest.cc
anage_profile_browsertest.js
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_create_confirm_handler.cc
anaged_user_import_handler.cc
anaged_user_import_handler.h
edia_devices_selection_handler.cc
edia_galleries_handler.cc
ptions_handlers_helper.cc
ptions_ui.cc
ptions_ui.h
assword_manager_handler.cc
assword_manager_handler.h
references_browsertest.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
earch_engine_manager_handler.cc
ettings_app_browsertest.js
tartup_pages_handler.cc
tartup_pages_handler.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
lear_browser_data_handler.cc
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ore_options_handler.cc
reate_profile_handler.cc
reate_profile_handler.h
ont_settings_handler.cc
andler_options_handler.cc
ome_page_overlay_handler.cc
anguage_options_handler.cc
anguage_options_handler.h
anguage_options_handler_common.h
anage_profile_browsertest.js
anage_profile_handler.cc
anaged_user_import_handler.cc
anaged_user_import_handler.h
edia_galleries_handler.cc
ptions_ui.cc
ptions_ui_browsertest.cc
assword_manager_handler.cc
assword_manager_handler.h
references_browsertest.h
earch_engine_manager_handler.cc
earch_engine_manager_handler.h
tartup_pages_handler.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
ontent_settings_handler.cc
ore_options_handler.cc
ore_options_handler.h
ont_settings_handler.cc
anage_profile_browsertest.js
anage_profile_handler.cc
ptions_browsertest.js
assword_manager_handler.cc
assword_manager_handler.h
references_browsertest.cc
references_browsertest.h
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
earch_engine_manager_handler.cc
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/timezone_options_util.cc
hromeos/timezone_options_util.h
ontent_settings_handler.cc
ptions_browsertest.cc
ptions_browsertest.h
ptions_browsertest.js
eset_profile_settings_handler.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
dvanced_options_utils_linux.cc
dvanced_options_utils_x11.cc
rowser_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/keyboard_handler.cc
ont_settings_browsertest.js
ont_settings_handler.cc
ont_settings_handler.h
anage_profile_handler.cc
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_browsertest.js
assword_manager_handler.cc
assword_manager_handler.h
tartup_page_list_browsertest.js
tartup_pages_handler.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
anage_profile_handler.cc
anage_profile_handler.h
ptions_ui.cc
ptions_ui.h
ptions_ui_browsertest.cc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/DEPS
hromeos/OWNERS
hromeos/accounts_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/timezone_options_util.cc
ontent_settings_handler.cc
mport_data_handler.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_import_handler.h
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_browsertest.js
ptions_ui.cc
assword_manager_handler.cc
assword_manager_handler.h
references_browsertest.cc
eset_profile_settings_handler.cc
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
reate_profile_handler.cc
reate_profile_handler.h
edia_galleries_handler.cc
ptions_handlers_helper.cc
ptions_handlers_helper.h
ptions_ui.cc
references_browsertest.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
dvanced_options_utils_win.cc
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
mport_data_handler.cc
mport_data_handler.h
anguage_dictionary_overlay_handler.cc
anguage_options_handler_common.cc
anguage_options_handler_common.h
anaged_user_import_handler.cc
anaged_user_import_handler.h
edia_galleries_handler.cc
eset_profile_settings_handler.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/language_chewing_handler.cc
hromeos/language_chewing_handler.h
hromeos/language_hangul_handler.cc
hromeos/language_hangul_handler.h
hromeos/language_mozc_handler.cc
hromeos/language_mozc_handler.h
hromeos/language_options_util.cc
hromeos/language_options_util.h
hromeos/language_pinyin_handler.cc
hromeos/language_pinyin_handler.h
anage_profile_browsertest.js
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_import_handler.cc
anaged_user_import_handler.h
ptions_ui.cc
assword_manager_handler.cc
assword_manager_handler.h
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
rowser_options_handler.cc
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/cros_language_options_handler_unittest.cc
anguage_options_handler_common.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/OWNERS
hromeos/change_picture_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
ontent_settings_handler.cc
eolocation_options_handler.cc
anage_profile_browsertest.js
anage_profile_handler.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
rowser_options_handler.cc
rowser_options_handler.h
anage_profile_handler.cc
anage_profile_handler.h
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
rowser_options_handler.cc
rowser_options_handler.h
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
lear_browser_data_handler.cc
mport_data_handler.cc
mport_data_handler.h
anage_profile_handler.cc
eset_profile_settings_handler.cc
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
hromeos/internet_options_handler.cc
ptions_ui.cc
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/change_picture_options_handler.cc
anage_profile_handler.cc
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
ookies_view_browsertest.js
anage_profile_handler.cc
anage_profile_handler.h
ptions_browsertest.js
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/internet_options_handler.cc
hromeos/user_image_source.cc
ontent_settings_handler.cc
ontent_settings_handler.h
anage_profile_browsertest.js
anage_profile_handler.cc
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
rowser_options_handler.cc
ome_page_overlay_handler.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
tartup_pages_handler.cc
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
rowser_options_handler.cc
ertificate_manager_browsertest.cc
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/proxy_handler.cc
ontent_settings_handler.cc
ore_options_handler.cc
ptions_browsertest.cc
ptions_browsertest.h
ptions_browsertest.js
ptions_ui_browsertest.cc
ptions_ui_browsertest.h
tartup_pages_handler.cc
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
rowser_options_handler.cc
hromeos/internet_options_handler.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
dvanced_options_utils_x11.cc
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
rowser_options_handler.cc
hromeos/internet_options_handler.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
rowser_options_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/internet_options_handler.cc
hromeos/timezone_options_util.cc
ore_options_handler.cc
anage_profile_handler.cc
references_browsertest.cc
references_browsertest.h
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
hromeos/user_image_source.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_create_confirm_handler.cc
ptions_ui.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
dvanced_options_utils_x11.cc
rowser_options_handler.cc
ertificate_manager_browsertest.cc
hromeos/accounts_options_browsertest.js
hromeos/change_picture_options_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/user_image_source.cc
ontent_settings_handler.cc
ore_options_handler.cc
dit_dictionary_browsertest.js
ont_settings_handler.cc
andler_options_handler.cc
mport_data_handler.cc
anage_profile_handler.cc
edia_galleries_handler.cc
ptions_ui.cc
assword_manager_handler.cc
references_browsertest.cc
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
tartup_pages_handler.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/accounts_options_browsertest.js
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/proxy_handler.cc
ore_options_handler.cc
mport_data_handler.cc
mport_data_handler.h
anguage_options_handler_common.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_create_confirm_handler.cc
anaged_user_learn_more_handler.cc
edia_galleries_handler.cc
ptions_ui.cc
references_browsertest.cc
ettings_app_browsertest.js
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
utofill_options_handler.cc
rowser_options_handler.cc
ertificate_manager_browsertest.cc
ertificate_manager_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler_unittest.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
lear_browser_data_handler.cc
ontent_settings_handler.cc
eolocation_options_handler.cc
eolocation_options_handler.h
anguage_options_handler_common.cc
anaged_user_create_confirm_handler.cc
edia_galleries_handler.cc
ptions_ui.cc
assword_manager_handler.cc
eset_profile_settings_handler.cc
tartup_pages_handler.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
anguage_options_handler_common.cc
references_browsertest.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
dvanced_options_utils_x11.cc
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.cc
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/change_picture_options_handler.cc
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/display_options_handler.cc
hromeos/internet_options_handler.cc
hromeos/kiosk_apps_browsertest.js
hromeos/kiosk_apps_handler.cc
hromeos/kiosk_apps_handler.h
hromeos/language_chewing_handler.cc
hromeos/language_hangul_handler.cc
hromeos/language_mozc_handler.cc
hromeos/language_options_util.h
hromeos/pointer_handler.cc
hromeos/proxy_handler.cc
hromeos/stats_options_handler.cc
hromeos/timezone_options_util.cc
lear_browser_data_handler.cc
ontent_settings_handler.cc
ookies_view_handler.cc
ore_options_handler.cc
ont_settings_handler.cc
andler_options_handler.cc
mport_data_handler.cc
anguage_options_handler.cc
anguage_options_handler_common.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_create_confirm_handler.cc
anaged_user_create_confirm_handler.h
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_sync_setup_handler.cc
ptions_sync_setup_handler.h
ptions_ui.cc
ptions_ui_browsertest.cc
assword_manager_handler.cc
references_browsertest.cc
eset_profile_settings_handler.cc
earch_engine_manager_handler.cc
earch_engine_manager_handler.h
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
rowser_options_handler.cc
rowser_options_handler.h
hromeos/bluetooth_options_browsertest.js
hromeos/change_picture_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/kiosk_apps_handler.cc
ookies_view_browsertest.js
mport_data_handler.cc
anguage_dictionary_overlay_handler.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_learn_more_handler.cc
anaged_user_learn_more_handler.h
anaged_user_passphrase_handler.cc
anaged_user_passphrase_handler.h
anaged_user_set_passphrase_browsertest.js
anaged_user_set_passphrase_test.cc
anaged_user_set_passphrase_test.h
anaged_user_settings_browsertest.js
anaged_user_settings_handler.cc
anaged_user_settings_handler.h
anaged_user_settings_test.cc
anaged_user_settings_test.h
ptions_ui.cc
references_browsertest.cc
references_browsertest.h
rofile_settings_reset_browsertest.js
eset_profile_settings_handler.cc
eset_profile_settings_handler.h
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
dvanced_options_utils_win.cc
utofill_options_handler.cc
rowser_options_handler.cc
rowser_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler_unittest.cc
hromeos/proxy_handler.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
rowser_options_handler.cc
rowser_options_handler.h
hromeos/internet_options_handler.cc
hromeos/keyboard_handler.cc
anaged_user_settings_handler.cc
anaged_user_settings_handler.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/bluetooth_options_browsertest.js
hromeos/bluetooth_options_handler.cc
hromeos/bluetooth_options_handler.h
hromeos/change_picture_options_handler.cc
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/cros_language_options_handler_unittest.cc
hromeos/display_overscan_handler.cc
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
hromeos/kiosk_apps_browsertest.js
hromeos/kiosk_apps_handler.cc
hromeos/kiosk_apps_handler.h
hromeos/proxy_handler.cc
hromeos/proxy_handler.h
hromeos/user_image_source.cc
hromeos/user_image_source.h
lear_browser_data_handler.cc
ontent_settings_handler.cc
ont_settings_handler.cc
ont_settings_utils_mac.mm
andler_options_handler.cc
mport_data_handler.cc
anguage_options_handler_unittest.cc
anage_profile_handler.cc
anaged_user_passphrase_handler.cc
anaged_user_passphrase_handler.h
anaged_user_set_passphrase_browsertest.js
anaged_user_set_passphrase_test.cc
anaged_user_set_passphrase_test.h
anaged_user_settings_browsertest.js
anaged_user_settings_handler.cc
anaged_user_settings_handler.h
anaged_user_settings_test.cc
anaged_user_settings_test.h
ptions_ui.cc
assword_manager_handler.cc
references_browsertest.cc
earch_engine_manager_handler.cc
ettings_format_browsertest.js
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
WNERS
dvanced_options_utils_win.cc
dvanced_options_utils_x11.cc
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/OWNERS
hromeos/accounts_options_handler.cc
hromeos/bluetooth_options_handler.cc
hromeos/bluetooth_options_handler.h
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/display_overscan_handler.cc
hromeos/display_overscan_handler.h
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
hromeos/keyboard_handler.h
hromeos/kiosk_apps_browsertest.js
hromeos/kiosk_apps_handler.cc
hromeos/kiosk_apps_handler.h
hromeos/language_chewing_handler.cc
hromeos/language_hangul_handler.cc
hromeos/language_mozc_handler.cc
hromeos/language_options_util.cc
hromeos/language_options_util.h
hromeos/language_pinyin_handler.cc
hromeos/pointer_handler.cc
hromeos/pointer_handler.h
hromeos/set_wallpaper_options_handler.cc
hromeos/set_wallpaper_options_handler.h
hromeos/timezone_options_util.cc
hromeos/user_image_source.cc
hromeos/user_image_source.h
hromeos/wallpaper_source.cc
hromeos/wallpaper_source.h
hromeos/wallpaper_thumbnail_source.cc
hromeos/wallpaper_thumbnail_source.h
lear_browser_data_handler.cc
lear_browser_data_handler.h
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_handler.cc
ookies_view_handler.h
ore_options_handler.cc
ore_options_handler.h
dit_dictionary_browsertest.js
ont_settings_handler.cc
ont_settings_handler.h
ont_settings_utils_linux.cc
ont_settings_utils_mac.mm
ont_settings_utils_x11.cc
andler_options_handler.cc
ome_page_overlay_handler.cc
mport_data_handler.cc
anguage_dictionary_overlay_handler.cc
anguage_dictionary_overlay_handler.h
anguage_options_dictionary_download_browsertest.js
anguage_options_handler.cc
anguage_options_handler_common.cc
anguage_options_handler_common.h
anguage_options_handler_unittest.cc
anage_profile_handler.cc
anage_profile_handler.h
anaged_user_passphrase_handler.cc
anaged_user_passphrase_handler.h
anaged_user_set_passphrase_browsertest.js
anaged_user_set_passphrase_test.cc
anaged_user_set_passphrase_test.h
anaged_user_settings_browsertest.js
anaged_user_settings_handler.cc
anaged_user_settings_handler.h
anaged_user_settings_test.cc
anaged_user_settings_test.h
edia_devices_selection_handler.cc
edia_devices_selection_handler.h
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_sync_setup_handler.cc
ptions_ui.cc
ptions_ui.h
ptions_ui_browsertest.cc
assword_manager_handler.cc
assword_manager_handler.h
epper_flash_content_settings_utils.cc
epper_flash_content_settings_utils.h
epper_flash_content_settings_utils_unittest.cc
references_browsertest.cc
references_browsertest.h
earch_engine_manager_handler.cc
ettings_format_browsertest.js
tartup_pages_handler.cc
tartup_pages_handler.h
eb_intents_settings_handler.cc
eb_intents_settings_handler.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
WNERS
dvanced_options_utils.h
dvanced_options_utils_mac.mm
dvanced_options_utils_win.cc
dvanced_options_utils_x11.cc
utofill_options_browsertest.js
utofill_options_handler.cc
utofill_options_handler.h
rowser_options_browsertest.js
rowser_options_handler.cc
rowser_options_handler.h
ertificate_manager_browsertest.js
ertificate_manager_handler.cc
ertificate_manager_handler.h
hromeos/OWNERS
hromeos/accounts_options_handler.cc
hromeos/accounts_options_handler.h
hromeos/bluetooth_options_handler.cc
hromeos/bluetooth_options_handler.h
hromeos/change_picture_options_handler.cc
hromeos/change_picture_options_handler.h
hromeos/core_chromeos_options_handler.cc
hromeos/core_chromeos_options_handler.h
hromeos/cros_language_options_handler.cc
hromeos/cros_language_options_handler.h
hromeos/display_options_handler.cc
hromeos/display_options_handler.h
hromeos/guest_mode_options_ui_browsertest.cc
hromeos/internet_options_handler.cc
hromeos/internet_options_handler.h
hromeos/keyboard_handler.cc
hromeos/keyboard_handler.h
hromeos/language_chewing_handler.cc
hromeos/language_chewing_handler.h
hromeos/language_hangul_handler.cc
hromeos/language_hangul_handler.h
hromeos/language_mozc_handler.cc
hromeos/language_mozc_handler.h
hromeos/language_options_util.cc
hromeos/language_options_util.h
hromeos/language_pinyin_handler.cc
hromeos/language_pinyin_handler.h
hromeos/pointer_handler.cc
hromeos/pointer_handler.h
hromeos/proxy_handler.cc
hromeos/proxy_handler.h
hromeos/set_wallpaper_options_handler.cc
hromeos/set_wallpaper_options_handler.h
hromeos/stats_options_handler.cc
hromeos/stats_options_handler.h
hromeos/timezone_options_util.cc
hromeos/timezone_options_util.h
hromeos/user_image_source.cc
hromeos/user_image_source.h
hromeos/wallpaper_source.cc
hromeos/wallpaper_source.h
hromeos/wallpaper_thumbnail_source.cc
hromeos/wallpaper_thumbnail_source.h
lear_browser_data_handler.cc
lear_browser_data_handler.h
ontent_options_browsertest.js
ontent_settings_exception_area_browsertest.js
ontent_settings_handler.cc
ontent_settings_handler.h
ookies_view_browsertest.js
ookies_view_handler.cc
ookies_view_handler.h
ore_options_handler.cc
ore_options_handler.h
ont_settings_browsertest.js
ont_settings_handler.cc
ont_settings_handler.h
ont_settings_utils.h
ont_settings_utils_mac.mm
ont_settings_utils_win.cc
ont_settings_utils_x11.cc
andler_options_handler.cc
andler_options_handler.h
ome_page_overlay_handler.cc
ome_page_overlay_handler.h
mport_data_handler.cc
mport_data_handler.h
anguage_options_browsertest.js
anguage_options_handler.cc
anguage_options_handler.h
anguage_options_handler_common.cc
anguage_options_handler_common.h
anguage_options_handler_unittest.cc
anage_profile_handler.cc
anage_profile_handler.h
edia_galleries_handler.cc
edia_galleries_handler.h
ptions_browsertest.js
ptions_sync_setup_handler.cc
ptions_sync_setup_handler.h
ptions_ui.cc
ptions_ui.h
ptions_ui_browsertest.cc
ptions_ui_browsertest.h
assword_manager_browsertest.js
assword_manager_handler.cc
assword_manager_handler.h
references_browsertest.cc
references_browsertest.h
earch_engine_manager_browsertest.js
earch_engine_manager_handler.cc
earch_engine_manager_handler.h
tartup_pages_handler.cc
tartup_pages_handler.h
eb_intents_settings_handler.cc
eb_intents_settings_handler.h