diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 23:29:35 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 23:29:35 +0000 |
commit | e107ad4ea932d963aea5dcbd2fac901c920f8ed2 (patch) | |
tree | 0b59b8d530e840b8e5e343496e84b0d7a7bdcadb /chrome | |
parent | 7852c59a0634f32719b738d465cc310f28c34b9c (diff) | |
download | chromium_src-e107ad4ea932d963aea5dcbd2fac901c920f8ed2.zip chromium_src-e107ad4ea932d963aea5dcbd2fac901c920f8ed2.tar.gz chromium_src-e107ad4ea932d963aea5dcbd2fac901c920f8ed2.tar.bz2 |
Options: Rename chrome/browser/resources/options2 -> chrome/browser/resources/options.
BUG=none
TEST=none
R=csilv
Review URL: https://chromiumcodereview.appspot.com/10809005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/resources/chromeos/proxy_settings.html | 16 | ||||
-rw-r--r-- | chrome/browser/resources/options/OWNERS (renamed from chrome/browser/resources/options2/OWNERS) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/alert_overlay.css (renamed from chrome/browser/resources/options2/alert_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/alert_overlay.html (renamed from chrome/browser/resources/options2/alert_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/alert_overlay.js (renamed from chrome/browser/resources/options2/alert_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_edit_address_overlay.html (renamed from chrome/browser/resources/options2/autofill_edit_address_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_edit_address_overlay.js (renamed from chrome/browser/resources/options2/autofill_edit_address_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_edit_creditcard_overlay.html (renamed from chrome/browser/resources/options2/autofill_edit_creditcard_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_edit_creditcard_overlay.js (renamed from chrome/browser/resources/options2/autofill_edit_creditcard_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_edit_overlay.css (renamed from chrome/browser/resources/options2/autofill_edit_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_options.css (renamed from chrome/browser/resources/options2/autofill_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_options.html (renamed from chrome/browser/resources/options2/autofill_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_options.js (renamed from chrome/browser/resources/options2/autofill_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/autofill_options_list.js (renamed from chrome/browser/resources/options2/autofill_options_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options.css (renamed from chrome/browser/resources/options2/browser_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options.html (renamed from chrome/browser/resources/options2/browser_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options.js (renamed from chrome/browser/resources/options2/browser_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options_profile_list.js (renamed from chrome/browser/resources/options2/browser_options_profile_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/browser_options_startup_page_list.js (renamed from chrome/browser/resources/options2/browser_options_startup_page_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_backup_overlay.html (renamed from chrome/browser/resources/options2/certificate_backup_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_backup_overlay.js (renamed from chrome/browser/resources/options2/certificate_backup_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html (renamed from chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js (renamed from chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_import_error_overlay.html (renamed from chrome/browser/resources/options2/certificate_import_error_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_import_error_overlay.js (renamed from chrome/browser/resources/options2/certificate_import_error_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_manager.css (renamed from chrome/browser/resources/options2/certificate_manager.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_manager.html (renamed from chrome/browser/resources/options2/certificate_manager.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_manager.js (renamed from chrome/browser/resources/options2/certificate_manager.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_restore_overlay.html (renamed from chrome/browser/resources/options2/certificate_restore_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_restore_overlay.js (renamed from chrome/browser/resources/options2/certificate_restore_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_tree.css (renamed from chrome/browser/resources/options2/certificate_tree.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/certificate_tree.js (renamed from chrome/browser/resources/options2/certificate_tree.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/OWNERS (renamed from chrome/browser/resources/options2/chromeos/OWNERS) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/accounts_options.html (renamed from chrome/browser/resources/options2/chromeos/accounts_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/accounts_options.js (renamed from chrome/browser/resources/options2/chromeos/accounts_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/accounts_options_page.css (renamed from chrome/browser/resources/options2/chromeos/accounts_options_page.css) | 2 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/accounts_user_list.js (renamed from chrome/browser/resources/options2/chromeos/accounts_user_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/accounts_user_name_edit.js (renamed from chrome/browser/resources/options2/chromeos/accounts_user_name_edit.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth.css (renamed from chrome/browser/resources/options2/chromeos/bluetooth.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.html (renamed from chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js (renamed from chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth_device_list.js (renamed from chrome/browser/resources/options2/chromeos/bluetooth_device_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.html (renamed from chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js (renamed from chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/cellular_plan_element.js (renamed from chrome/browser/resources/options2/chromeos/cellular_plan_element.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/change_picture_options.css (renamed from chrome/browser/resources/options2/chromeos/change_picture_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/change_picture_options.html (renamed from chrome/browser/resources/options2/chromeos/change_picture_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/change_picture_options.js (renamed from chrome/browser/resources/options2/chromeos/change_picture_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/display_options.css (renamed from chrome/browser/resources/options2/chromeos/display_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/display_options.html (renamed from chrome/browser/resources/options2/chromeos/display_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/display_options.js (renamed from chrome/browser/resources/options2/chromeos/display_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/internet_detail.css (renamed from chrome/browser/resources/options2/chromeos/internet_detail.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/internet_detail.html (renamed from chrome/browser/resources/options2/chromeos/internet_detail.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/internet_detail.js (renamed from chrome/browser/resources/options2/chromeos/internet_detail.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/internet_detail_ip_address_field.js (renamed from chrome/browser/resources/options2/chromeos/internet_detail_ip_address_field.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/keyboard_overlay.html (renamed from chrome/browser/resources/options2/chromeos/keyboard_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/keyboard_overlay.js (renamed from chrome/browser/resources/options2/chromeos/keyboard_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/language_chewing_options.html (renamed from chrome/browser/resources/options2/chromeos/language_chewing_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/language_hangul_options.html (renamed from chrome/browser/resources/options2/chromeos/language_hangul_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/language_mozc_options.html (renamed from chrome/browser/resources/options2/chromeos/language_mozc_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/language_pinyin_options.html (renamed from chrome/browser/resources/options2/chromeos/language_pinyin_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/network_list.js (renamed from chrome/browser/resources/options2/chromeos/network_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/pointer_overlay.css (renamed from chrome/browser/resources/options2/chromeos/pointer_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/pointer_overlay.html (renamed from chrome/browser/resources/options2/chromeos/pointer_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/pointer_overlay.js (renamed from chrome/browser/resources/options2/chromeos/pointer_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/preferred_networks.html (renamed from chrome/browser/resources/options2/chromeos/preferred_networks.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/preferred_networks.js (renamed from chrome/browser/resources/options2/chromeos/preferred_networks.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/proxy_rules_list.js (renamed from chrome/browser/resources/options2/chromeos/proxy_rules_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/set_wallpaper_options.css (renamed from chrome/browser/resources/options2/chromeos/set_wallpaper_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/set_wallpaper_options.html (renamed from chrome/browser/resources/options2/chromeos/set_wallpaper_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos/set_wallpaper_options.js (renamed from chrome/browser/resources/options2/chromeos/set_wallpaper_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/clear_browser_data_overlay.css (renamed from chrome/browser/resources/options2/clear_browser_data_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/clear_browser_data_overlay.html (renamed from chrome/browser/resources/options2/clear_browser_data_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/clear_browser_data_overlay.js (renamed from chrome/browser/resources/options2/clear_browser_data_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings.css (renamed from chrome/browser/resources/options2/content_settings.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings.html (renamed from chrome/browser/resources/options2/content_settings.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings.js (renamed from chrome/browser/resources/options2/content_settings.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings_exceptions_area.html (renamed from chrome/browser/resources/options2/content_settings_exceptions_area.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings_exceptions_area.js (renamed from chrome/browser/resources/options2/content_settings_exceptions_area.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/content_settings_ui.js (renamed from chrome/browser/resources/options2/content_settings_ui.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/controlled_setting.js (renamed from chrome/browser/resources/options2/controlled_setting.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_list.js (renamed from chrome/browser/resources/options2/cookies_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_view.css (renamed from chrome/browser/resources/options2/cookies_view.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_view.html (renamed from chrome/browser/resources/options2/cookies_view.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_view.js (renamed from chrome/browser/resources/options2/cookies_view.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_view_app.html (renamed from chrome/browser/resources/options2/cookies_view_app.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/cookies_view_app.js (renamed from chrome/browser/resources/options2/cookies_view_app.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/deletable_item_list.js (renamed from chrome/browser/resources/options2/deletable_item_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/editable_text_field.js (renamed from chrome/browser/resources/options2/editable_text_field.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/font_settings.css (renamed from chrome/browser/resources/options2/font_settings.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/font_settings.html (renamed from chrome/browser/resources/options2/font_settings.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/font_settings.js (renamed from chrome/browser/resources/options2/font_settings.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/handler_options.css (renamed from chrome/browser/resources/options2/handler_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/handler_options.html (renamed from chrome/browser/resources/options2/handler_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/handler_options.js (renamed from chrome/browser/resources/options2/handler_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/handler_options_list.js (renamed from chrome/browser/resources/options2/handler_options_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/home_page_overlay.css (renamed from chrome/browser/resources/options2/home_page_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/home_page_overlay.html (renamed from chrome/browser/resources/options2/home_page_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/home_page_overlay.js (renamed from chrome/browser/resources/options2/home_page_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/import_data_overlay.css (renamed from chrome/browser/resources/options2/import_data_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/import_data_overlay.html (renamed from chrome/browser/resources/options2/import_data_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/import_data_overlay.js (renamed from chrome/browser/resources/options2/import_data_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/inline_editable_list.js (renamed from chrome/browser/resources/options2/inline_editable_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/instant_confirm_overlay.css (renamed from chrome/browser/resources/options2/instant_confirm_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/instant_confirm_overlay.html (renamed from chrome/browser/resources/options2/instant_confirm_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/instant_confirm_overlay.js (renamed from chrome/browser/resources/options2/instant_confirm_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_add_language_overlay.html (renamed from chrome/browser/resources/options2/language_add_language_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_add_language_overlay.js (renamed from chrome/browser/resources/options2/language_add_language_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_list.js (renamed from chrome/browser/resources/options2/language_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_options.css (renamed from chrome/browser/resources/options2/language_options.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_options.html (renamed from chrome/browser/resources/options2/language_options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/language_options.js (renamed from chrome/browser/resources/options2/language_options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/manage_profile_overlay.css (renamed from chrome/browser/resources/options2/manage_profile_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/manage_profile_overlay.html (renamed from chrome/browser/resources/options2/manage_profile_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/manage_profile_overlay.js (renamed from chrome/browser/resources/options2/manage_profile_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/media_galleries_list.js (renamed from chrome/browser/resources/options2/media_galleries_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/media_galleries_manager_overlay.html (renamed from chrome/browser/resources/options2/media_galleries_manager_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/media_galleries_manager_overlay.js (renamed from chrome/browser/resources/options2/media_galleries_manager_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options.html (renamed from chrome/browser/resources/options2/options.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options.js (renamed from chrome/browser/resources/options2/options.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options_bundle.js (renamed from chrome/browser/resources/options2/options_bundle.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options_focus_manager.js (renamed from chrome/browser/resources/options2/options_focus_manager.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options_page.css (renamed from chrome/browser/resources/options2/options_page.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/options_page.js (renamed from chrome/browser/resources/options2/options_page.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/password_manager.css (renamed from chrome/browser/resources/options2/password_manager.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/password_manager.html (renamed from chrome/browser/resources/options2/password_manager.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/password_manager.js (renamed from chrome/browser/resources/options2/password_manager.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/password_manager_list.css (renamed from chrome/browser/resources/options2/password_manager_list.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/password_manager_list.js (renamed from chrome/browser/resources/options2/password_manager_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/pref_ui.js (renamed from chrome/browser/resources/options2/pref_ui.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/preferences.js (renamed from chrome/browser/resources/options2/preferences.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/profiles_icon_grid.js (renamed from chrome/browser/resources/options2/profiles_icon_grid.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_box.html (renamed from chrome/browser/resources/options2/search_box.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_engine_manager.css (renamed from chrome/browser/resources/options2/search_engine_manager.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_engine_manager.html (renamed from chrome/browser/resources/options2/search_engine_manager.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_engine_manager.js (renamed from chrome/browser/resources/options2/search_engine_manager.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_engine_manager_engine_list.js (renamed from chrome/browser/resources/options2/search_engine_manager_engine_list.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_page.css (renamed from chrome/browser/resources/options2/search_page.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_page.html (renamed from chrome/browser/resources/options2/search_page.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/search_page.js (renamed from chrome/browser/resources/options2/search_page.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/settings_dialog.js (renamed from chrome/browser/resources/options2/settings_dialog.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/spelling_confirm_overlay.css (renamed from chrome/browser/resources/options2/spelling_confirm_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/spelling_confirm_overlay.html (renamed from chrome/browser/resources/options2/spelling_confirm_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/spelling_confirm_overlay.js (renamed from chrome/browser/resources/options2/spelling_confirm_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/startup_overlay.css (renamed from chrome/browser/resources/options2/startup_overlay.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/startup_overlay.html (renamed from chrome/browser/resources/options2/startup_overlay.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/startup_overlay.js (renamed from chrome/browser/resources/options2/startup_overlay.js) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/startup_section.html (renamed from chrome/browser/resources/options2/startup_section.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/subpages_tab_controls.css (renamed from chrome/browser/resources/options2/subpages_tab_controls.css) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options/sync_section.html (renamed from chrome/browser/resources/options2/sync_section.html) | 0 | ||||
-rw-r--r-- | chrome/browser/resources/options2_resources.grd | 15 | ||||
-rw-r--r-- | chrome/browser/resources/options_resources.grd | 15 | ||||
-rw-r--r-- | chrome/browser/resources/sync_promo/sync_promo.js | 2 | ||||
-rw-r--r-- | chrome/browser/resources/web_dev_style/js_checker.py | 2 | ||||
-rw-r--r-- | chrome/browser/ui/webui/options2/options_ui.cc | 6 | ||||
-rw-r--r-- | chrome/chrome_resources.gyp | 4 |
156 files changed, 31 insertions, 31 deletions
diff --git a/chrome/browser/resources/chromeos/proxy_settings.html b/chrome/browser/resources/chromeos/proxy_settings.html index 3194ca6..1579556 100644 --- a/chrome/browser/resources/chromeos/proxy_settings.html +++ b/chrome/browser/resources/chromeos/proxy_settings.html @@ -5,8 +5,8 @@ <link rel="stylesheet" href="chrome://resources/css/list.css"> <link rel="stylesheet" href="chrome://resources/css/widgets.css"> -<link rel="stylesheet" href="../options2/options_page.css"> -<link rel="stylesheet" href="../options2/chromeos/internet_detail.css"> +<link rel="stylesheet" href="../options/options_page.css"> +<link rel="stylesheet" href="../options/chromeos/internet_detail.css"> <link rel="stylesheet" href="proxy_settings.css"> <script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/event_tracker.js"></script> @@ -22,16 +22,16 @@ <script src="chrome://resources/js/local_strings.js"></script> <script src="chrome://resources/js/util.js"></script> -<script src="../options2/preferences.js"></script> -<script src="../options2/pref_ui.js"></script> -<script src="../options2/options_page.js"></script> -<script src="../options2/chromeos/internet_detail.js"></script> -<script src="../options2/chromeos/proxy_rules_list.js"></script> +<script src="../options/preferences.js"></script> +<script src="../options/pref_ui.js"></script> +<script src="../options/options_page.js"></script> +<script src="../options/chromeos/internet_detail.js"></script> +<script src="../options/chromeos/proxy_rules_list.js"></script> <script src="proxy_settings.js"></script> </head> <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> -<include src="../options2/chromeos/internet_detail.html"> +<include src="../options/chromeos/internet_detail.html"> </body> </html> diff --git a/chrome/browser/resources/options2/OWNERS b/chrome/browser/resources/options/OWNERS index 8d7d56d..8d7d56d 100644 --- a/chrome/browser/resources/options2/OWNERS +++ b/chrome/browser/resources/options/OWNERS diff --git a/chrome/browser/resources/options2/alert_overlay.css b/chrome/browser/resources/options/alert_overlay.css index b2d9960..b2d9960 100644 --- a/chrome/browser/resources/options2/alert_overlay.css +++ b/chrome/browser/resources/options/alert_overlay.css diff --git a/chrome/browser/resources/options2/alert_overlay.html b/chrome/browser/resources/options/alert_overlay.html index 94be15c..94be15c 100644 --- a/chrome/browser/resources/options2/alert_overlay.html +++ b/chrome/browser/resources/options/alert_overlay.html diff --git a/chrome/browser/resources/options2/alert_overlay.js b/chrome/browser/resources/options/alert_overlay.js index dbfd409..dbfd409 100644 --- a/chrome/browser/resources/options2/alert_overlay.js +++ b/chrome/browser/resources/options/alert_overlay.js diff --git a/chrome/browser/resources/options2/autofill_edit_address_overlay.html b/chrome/browser/resources/options/autofill_edit_address_overlay.html index 361445e..361445e 100644 --- a/chrome/browser/resources/options2/autofill_edit_address_overlay.html +++ b/chrome/browser/resources/options/autofill_edit_address_overlay.html diff --git a/chrome/browser/resources/options2/autofill_edit_address_overlay.js b/chrome/browser/resources/options/autofill_edit_address_overlay.js index 8d0059c..8d0059c 100644 --- a/chrome/browser/resources/options2/autofill_edit_address_overlay.js +++ b/chrome/browser/resources/options/autofill_edit_address_overlay.js diff --git a/chrome/browser/resources/options2/autofill_edit_creditcard_overlay.html b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html index bf3278b..bf3278b 100644 --- a/chrome/browser/resources/options2/autofill_edit_creditcard_overlay.html +++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html diff --git a/chrome/browser/resources/options2/autofill_edit_creditcard_overlay.js b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js index c9a0b0e..c9a0b0e 100644 --- a/chrome/browser/resources/options2/autofill_edit_creditcard_overlay.js +++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.js diff --git a/chrome/browser/resources/options2/autofill_edit_overlay.css b/chrome/browser/resources/options/autofill_edit_overlay.css index 76f56a6..76f56a6 100644 --- a/chrome/browser/resources/options2/autofill_edit_overlay.css +++ b/chrome/browser/resources/options/autofill_edit_overlay.css diff --git a/chrome/browser/resources/options2/autofill_options.css b/chrome/browser/resources/options/autofill_options.css index 488197c..488197c 100644 --- a/chrome/browser/resources/options2/autofill_options.css +++ b/chrome/browser/resources/options/autofill_options.css diff --git a/chrome/browser/resources/options2/autofill_options.html b/chrome/browser/resources/options/autofill_options.html index a1c4481..a1c4481 100644 --- a/chrome/browser/resources/options2/autofill_options.html +++ b/chrome/browser/resources/options/autofill_options.html diff --git a/chrome/browser/resources/options2/autofill_options.js b/chrome/browser/resources/options/autofill_options.js index 82d8c24..82d8c24 100644 --- a/chrome/browser/resources/options2/autofill_options.js +++ b/chrome/browser/resources/options/autofill_options.js diff --git a/chrome/browser/resources/options2/autofill_options_list.js b/chrome/browser/resources/options/autofill_options_list.js index 7bb9c7b..7bb9c7b 100644 --- a/chrome/browser/resources/options2/autofill_options_list.js +++ b/chrome/browser/resources/options/autofill_options_list.js diff --git a/chrome/browser/resources/options2/browser_options.css b/chrome/browser/resources/options/browser_options.css index 7e20964..7e20964 100644 --- a/chrome/browser/resources/options2/browser_options.css +++ b/chrome/browser/resources/options/browser_options.css diff --git a/chrome/browser/resources/options2/browser_options.html b/chrome/browser/resources/options/browser_options.html index 77c4215..77c4215 100644 --- a/chrome/browser/resources/options2/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html diff --git a/chrome/browser/resources/options2/browser_options.js b/chrome/browser/resources/options/browser_options.js index e0acdb7..e0acdb7 100644 --- a/chrome/browser/resources/options2/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js diff --git a/chrome/browser/resources/options2/browser_options_profile_list.js b/chrome/browser/resources/options/browser_options_profile_list.js index 822a379..822a379 100644 --- a/chrome/browser/resources/options2/browser_options_profile_list.js +++ b/chrome/browser/resources/options/browser_options_profile_list.js diff --git a/chrome/browser/resources/options2/browser_options_startup_page_list.js b/chrome/browser/resources/options/browser_options_startup_page_list.js index f88e5d4..f88e5d4 100644 --- a/chrome/browser/resources/options2/browser_options_startup_page_list.js +++ b/chrome/browser/resources/options/browser_options_startup_page_list.js diff --git a/chrome/browser/resources/options2/certificate_backup_overlay.html b/chrome/browser/resources/options/certificate_backup_overlay.html index 146b38f..146b38f 100644 --- a/chrome/browser/resources/options2/certificate_backup_overlay.html +++ b/chrome/browser/resources/options/certificate_backup_overlay.html diff --git a/chrome/browser/resources/options2/certificate_backup_overlay.js b/chrome/browser/resources/options/certificate_backup_overlay.js index c904a47..c904a47 100644 --- a/chrome/browser/resources/options2/certificate_backup_overlay.js +++ b/chrome/browser/resources/options/certificate_backup_overlay.js diff --git a/chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.html b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html index d875c27..d875c27 100644 --- a/chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.html +++ b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html diff --git a/chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.js b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js index 5f017c8..5f017c8 100644 --- a/chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.js +++ b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js diff --git a/chrome/browser/resources/options2/certificate_import_error_overlay.html b/chrome/browser/resources/options/certificate_import_error_overlay.html index d3946b4..d3946b4 100644 --- a/chrome/browser/resources/options2/certificate_import_error_overlay.html +++ b/chrome/browser/resources/options/certificate_import_error_overlay.html diff --git a/chrome/browser/resources/options2/certificate_import_error_overlay.js b/chrome/browser/resources/options/certificate_import_error_overlay.js index 4eed1d2..4eed1d2 100644 --- a/chrome/browser/resources/options2/certificate_import_error_overlay.js +++ b/chrome/browser/resources/options/certificate_import_error_overlay.js diff --git a/chrome/browser/resources/options2/certificate_manager.css b/chrome/browser/resources/options/certificate_manager.css index 0516e5b..0516e5b 100644 --- a/chrome/browser/resources/options2/certificate_manager.css +++ b/chrome/browser/resources/options/certificate_manager.css diff --git a/chrome/browser/resources/options2/certificate_manager.html b/chrome/browser/resources/options/certificate_manager.html index 47d59d0..47d59d0 100644 --- a/chrome/browser/resources/options2/certificate_manager.html +++ b/chrome/browser/resources/options/certificate_manager.html diff --git a/chrome/browser/resources/options2/certificate_manager.js b/chrome/browser/resources/options/certificate_manager.js index 480b8e1..480b8e1 100644 --- a/chrome/browser/resources/options2/certificate_manager.js +++ b/chrome/browser/resources/options/certificate_manager.js diff --git a/chrome/browser/resources/options2/certificate_restore_overlay.html b/chrome/browser/resources/options/certificate_restore_overlay.html index 82cc202..82cc202 100644 --- a/chrome/browser/resources/options2/certificate_restore_overlay.html +++ b/chrome/browser/resources/options/certificate_restore_overlay.html diff --git a/chrome/browser/resources/options2/certificate_restore_overlay.js b/chrome/browser/resources/options/certificate_restore_overlay.js index 2e16fbf..2e16fbf 100644 --- a/chrome/browser/resources/options2/certificate_restore_overlay.js +++ b/chrome/browser/resources/options/certificate_restore_overlay.js diff --git a/chrome/browser/resources/options2/certificate_tree.css b/chrome/browser/resources/options/certificate_tree.css index d8f5350..d8f5350 100644 --- a/chrome/browser/resources/options2/certificate_tree.css +++ b/chrome/browser/resources/options/certificate_tree.css diff --git a/chrome/browser/resources/options2/certificate_tree.js b/chrome/browser/resources/options/certificate_tree.js index 4e44bc1..4e44bc1 100644 --- a/chrome/browser/resources/options2/certificate_tree.js +++ b/chrome/browser/resources/options/certificate_tree.js diff --git a/chrome/browser/resources/options2/chromeos/OWNERS b/chrome/browser/resources/options/chromeos/OWNERS index 1bb1ea6..1bb1ea6 100644 --- a/chrome/browser/resources/options2/chromeos/OWNERS +++ b/chrome/browser/resources/options/chromeos/OWNERS diff --git a/chrome/browser/resources/options2/chromeos/accounts_options.html b/chrome/browser/resources/options/chromeos/accounts_options.html index adb451a..adb451a 100644 --- a/chrome/browser/resources/options2/chromeos/accounts_options.html +++ b/chrome/browser/resources/options/chromeos/accounts_options.html diff --git a/chrome/browser/resources/options2/chromeos/accounts_options.js b/chrome/browser/resources/options/chromeos/accounts_options.js index a4faaa6..a4faaa6 100644 --- a/chrome/browser/resources/options2/chromeos/accounts_options.js +++ b/chrome/browser/resources/options/chromeos/accounts_options.js diff --git a/chrome/browser/resources/options2/chromeos/accounts_options_page.css b/chrome/browser/resources/options/chromeos/accounts_options_page.css index 0a81c08..ec7971e 100644 --- a/chrome/browser/resources/options2/chromeos/accounts_options_page.css +++ b/chrome/browser/resources/options/chromeos/accounts_options_page.css @@ -85,7 +85,7 @@ #ownerOnlyWarning { -webkit-padding-start: 20px; - background-image: url('../../options/chromeos/warning.png'); + background-image: url('warning.png'); background-repeat: no-repeat; margin-bottom: 10px; margin-top: 10px; diff --git a/chrome/browser/resources/options2/chromeos/accounts_user_list.js b/chrome/browser/resources/options/chromeos/accounts_user_list.js index 7a2eda5..7a2eda5 100644 --- a/chrome/browser/resources/options2/chromeos/accounts_user_list.js +++ b/chrome/browser/resources/options/chromeos/accounts_user_list.js diff --git a/chrome/browser/resources/options2/chromeos/accounts_user_name_edit.js b/chrome/browser/resources/options/chromeos/accounts_user_name_edit.js index e6e5276..e6e5276 100644 --- a/chrome/browser/resources/options2/chromeos/accounts_user_name_edit.js +++ b/chrome/browser/resources/options/chromeos/accounts_user_name_edit.js diff --git a/chrome/browser/resources/options2/chromeos/bluetooth.css b/chrome/browser/resources/options/chromeos/bluetooth.css index f8b1fd0..f8b1fd0 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth.css +++ b/chrome/browser/resources/options/chromeos/bluetooth.css diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.html b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.html index a09222f..a09222f 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.html +++ b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.html diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.js b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js index e5713001..e5713001 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth_add_device_overlay.js +++ b/chrome/browser/resources/options/chromeos/bluetooth_add_device_overlay.js diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_device_list.js b/chrome/browser/resources/options/chromeos/bluetooth_device_list.js index eb715d7..eb715d7 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth_device_list.js +++ b/chrome/browser/resources/options/chromeos/bluetooth_device_list.js diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.html b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.html index 95b9c03..95b9c03 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.html +++ b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.html diff --git a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js index be86dfc..be86dfc 100644 --- a/chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js +++ b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js diff --git a/chrome/browser/resources/options2/chromeos/cellular_plan_element.js b/chrome/browser/resources/options/chromeos/cellular_plan_element.js index 2ec59f0..2ec59f0 100644 --- a/chrome/browser/resources/options2/chromeos/cellular_plan_element.js +++ b/chrome/browser/resources/options/chromeos/cellular_plan_element.js diff --git a/chrome/browser/resources/options2/chromeos/change_picture_options.css b/chrome/browser/resources/options/chromeos/change_picture_options.css index 098b3ab..098b3ab 100644 --- a/chrome/browser/resources/options2/chromeos/change_picture_options.css +++ b/chrome/browser/resources/options/chromeos/change_picture_options.css diff --git a/chrome/browser/resources/options2/chromeos/change_picture_options.html b/chrome/browser/resources/options/chromeos/change_picture_options.html index 0bfa12c..0bfa12c 100644 --- a/chrome/browser/resources/options2/chromeos/change_picture_options.html +++ b/chrome/browser/resources/options/chromeos/change_picture_options.html diff --git a/chrome/browser/resources/options2/chromeos/change_picture_options.js b/chrome/browser/resources/options/chromeos/change_picture_options.js index 2404337..2404337 100644 --- a/chrome/browser/resources/options2/chromeos/change_picture_options.js +++ b/chrome/browser/resources/options/chromeos/change_picture_options.js diff --git a/chrome/browser/resources/options2/chromeos/display_options.css b/chrome/browser/resources/options/chromeos/display_options.css index 7d32475..7d32475 100644 --- a/chrome/browser/resources/options2/chromeos/display_options.css +++ b/chrome/browser/resources/options/chromeos/display_options.css diff --git a/chrome/browser/resources/options2/chromeos/display_options.html b/chrome/browser/resources/options/chromeos/display_options.html index 3b865c8..3b865c8 100644 --- a/chrome/browser/resources/options2/chromeos/display_options.html +++ b/chrome/browser/resources/options/chromeos/display_options.html diff --git a/chrome/browser/resources/options2/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js index b663d94..b663d94 100644 --- a/chrome/browser/resources/options2/chromeos/display_options.js +++ b/chrome/browser/resources/options/chromeos/display_options.js diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.css b/chrome/browser/resources/options/chromeos/internet_detail.css index b92a4f5..b92a4f5 100644 --- a/chrome/browser/resources/options2/chromeos/internet_detail.css +++ b/chrome/browser/resources/options/chromeos/internet_detail.css diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html index 7069d27..7069d27 100644 --- a/chrome/browser/resources/options2/chromeos/internet_detail.html +++ b/chrome/browser/resources/options/chromeos/internet_detail.html diff --git a/chrome/browser/resources/options2/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js index 51c28e7..51c28e7 100644 --- a/chrome/browser/resources/options2/chromeos/internet_detail.js +++ b/chrome/browser/resources/options/chromeos/internet_detail.js diff --git a/chrome/browser/resources/options2/chromeos/internet_detail_ip_address_field.js b/chrome/browser/resources/options/chromeos/internet_detail_ip_address_field.js index 5155ecd..5155ecd 100644 --- a/chrome/browser/resources/options2/chromeos/internet_detail_ip_address_field.js +++ b/chrome/browser/resources/options/chromeos/internet_detail_ip_address_field.js diff --git a/chrome/browser/resources/options2/chromeos/keyboard_overlay.html b/chrome/browser/resources/options/chromeos/keyboard_overlay.html index 7e6c047..7e6c047 100644 --- a/chrome/browser/resources/options2/chromeos/keyboard_overlay.html +++ b/chrome/browser/resources/options/chromeos/keyboard_overlay.html diff --git a/chrome/browser/resources/options2/chromeos/keyboard_overlay.js b/chrome/browser/resources/options/chromeos/keyboard_overlay.js index 45b6859..45b6859 100644 --- a/chrome/browser/resources/options2/chromeos/keyboard_overlay.js +++ b/chrome/browser/resources/options/chromeos/keyboard_overlay.js diff --git a/chrome/browser/resources/options2/chromeos/language_chewing_options.html b/chrome/browser/resources/options/chromeos/language_chewing_options.html index f5cd74c..f5cd74c 100644 --- a/chrome/browser/resources/options2/chromeos/language_chewing_options.html +++ b/chrome/browser/resources/options/chromeos/language_chewing_options.html diff --git a/chrome/browser/resources/options2/chromeos/language_hangul_options.html b/chrome/browser/resources/options/chromeos/language_hangul_options.html index 1a8d094..1a8d094 100644 --- a/chrome/browser/resources/options2/chromeos/language_hangul_options.html +++ b/chrome/browser/resources/options/chromeos/language_hangul_options.html diff --git a/chrome/browser/resources/options2/chromeos/language_mozc_options.html b/chrome/browser/resources/options/chromeos/language_mozc_options.html index 6f3aec2..6f3aec2 100644 --- a/chrome/browser/resources/options2/chromeos/language_mozc_options.html +++ b/chrome/browser/resources/options/chromeos/language_mozc_options.html diff --git a/chrome/browser/resources/options2/chromeos/language_pinyin_options.html b/chrome/browser/resources/options/chromeos/language_pinyin_options.html index 68d5013..68d5013 100644 --- a/chrome/browser/resources/options2/chromeos/language_pinyin_options.html +++ b/chrome/browser/resources/options/chromeos/language_pinyin_options.html diff --git a/chrome/browser/resources/options2/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js index 4408828..4408828 100644 --- a/chrome/browser/resources/options2/chromeos/network_list.js +++ b/chrome/browser/resources/options/chromeos/network_list.js diff --git a/chrome/browser/resources/options2/chromeos/pointer_overlay.css b/chrome/browser/resources/options/chromeos/pointer_overlay.css index 66924c2..66924c2 100644 --- a/chrome/browser/resources/options2/chromeos/pointer_overlay.css +++ b/chrome/browser/resources/options/chromeos/pointer_overlay.css diff --git a/chrome/browser/resources/options2/chromeos/pointer_overlay.html b/chrome/browser/resources/options/chromeos/pointer_overlay.html index 706ca9e..706ca9e 100644 --- a/chrome/browser/resources/options2/chromeos/pointer_overlay.html +++ b/chrome/browser/resources/options/chromeos/pointer_overlay.html diff --git a/chrome/browser/resources/options2/chromeos/pointer_overlay.js b/chrome/browser/resources/options/chromeos/pointer_overlay.js index eaeaf94..eaeaf94 100644 --- a/chrome/browser/resources/options2/chromeos/pointer_overlay.js +++ b/chrome/browser/resources/options/chromeos/pointer_overlay.js diff --git a/chrome/browser/resources/options2/chromeos/preferred_networks.html b/chrome/browser/resources/options/chromeos/preferred_networks.html index d7f112e..d7f112e 100644 --- a/chrome/browser/resources/options2/chromeos/preferred_networks.html +++ b/chrome/browser/resources/options/chromeos/preferred_networks.html diff --git a/chrome/browser/resources/options2/chromeos/preferred_networks.js b/chrome/browser/resources/options/chromeos/preferred_networks.js index 6c875d7..6c875d7 100644 --- a/chrome/browser/resources/options2/chromeos/preferred_networks.js +++ b/chrome/browser/resources/options/chromeos/preferred_networks.js diff --git a/chrome/browser/resources/options2/chromeos/proxy_rules_list.js b/chrome/browser/resources/options/chromeos/proxy_rules_list.js index fa7c2ec..fa7c2ec 100644 --- a/chrome/browser/resources/options2/chromeos/proxy_rules_list.js +++ b/chrome/browser/resources/options/chromeos/proxy_rules_list.js diff --git a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.css b/chrome/browser/resources/options/chromeos/set_wallpaper_options.css index 2732dea..2732dea 100644 --- a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.css +++ b/chrome/browser/resources/options/chromeos/set_wallpaper_options.css diff --git a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.html b/chrome/browser/resources/options/chromeos/set_wallpaper_options.html index e47da5b..e47da5b 100644 --- a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.html +++ b/chrome/browser/resources/options/chromeos/set_wallpaper_options.html diff --git a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.js b/chrome/browser/resources/options/chromeos/set_wallpaper_options.js index 4f01abb..4f01abb 100644 --- a/chrome/browser/resources/options2/chromeos/set_wallpaper_options.js +++ b/chrome/browser/resources/options/chromeos/set_wallpaper_options.js diff --git a/chrome/browser/resources/options2/clear_browser_data_overlay.css b/chrome/browser/resources/options/clear_browser_data_overlay.css index 0c70109..0c70109 100644 --- a/chrome/browser/resources/options2/clear_browser_data_overlay.css +++ b/chrome/browser/resources/options/clear_browser_data_overlay.css diff --git a/chrome/browser/resources/options2/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index 24a43545..24a43545 100644 --- a/chrome/browser/resources/options2/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html diff --git a/chrome/browser/resources/options2/clear_browser_data_overlay.js b/chrome/browser/resources/options/clear_browser_data_overlay.js index fa7aadd..fa7aadd 100644 --- a/chrome/browser/resources/options2/clear_browser_data_overlay.js +++ b/chrome/browser/resources/options/clear_browser_data_overlay.js diff --git a/chrome/browser/resources/options2/content_settings.css b/chrome/browser/resources/options/content_settings.css index 53b7ca6..53b7ca6 100644 --- a/chrome/browser/resources/options2/content_settings.css +++ b/chrome/browser/resources/options/content_settings.css diff --git a/chrome/browser/resources/options2/content_settings.html b/chrome/browser/resources/options/content_settings.html index 03c25e0a..03c25e0a 100644 --- a/chrome/browser/resources/options2/content_settings.html +++ b/chrome/browser/resources/options/content_settings.html diff --git a/chrome/browser/resources/options2/content_settings.js b/chrome/browser/resources/options/content_settings.js index fd45aca..fd45aca 100644 --- a/chrome/browser/resources/options2/content_settings.js +++ b/chrome/browser/resources/options/content_settings.js diff --git a/chrome/browser/resources/options2/content_settings_exceptions_area.html b/chrome/browser/resources/options/content_settings_exceptions_area.html index cbcfd77..cbcfd77 100644 --- a/chrome/browser/resources/options2/content_settings_exceptions_area.html +++ b/chrome/browser/resources/options/content_settings_exceptions_area.html diff --git a/chrome/browser/resources/options2/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js index b9bb96d..b9bb96d 100644 --- a/chrome/browser/resources/options2/content_settings_exceptions_area.js +++ b/chrome/browser/resources/options/content_settings_exceptions_area.js diff --git a/chrome/browser/resources/options2/content_settings_ui.js b/chrome/browser/resources/options/content_settings_ui.js index dc7b0c4..dc7b0c4 100644 --- a/chrome/browser/resources/options2/content_settings_ui.js +++ b/chrome/browser/resources/options/content_settings_ui.js diff --git a/chrome/browser/resources/options2/controlled_setting.js b/chrome/browser/resources/options/controlled_setting.js index 9ff806c..9ff806c 100644 --- a/chrome/browser/resources/options2/controlled_setting.js +++ b/chrome/browser/resources/options/controlled_setting.js diff --git a/chrome/browser/resources/options2/cookies_list.js b/chrome/browser/resources/options/cookies_list.js index 0968f3c..0968f3c 100644 --- a/chrome/browser/resources/options2/cookies_list.js +++ b/chrome/browser/resources/options/cookies_list.js diff --git a/chrome/browser/resources/options2/cookies_view.css b/chrome/browser/resources/options/cookies_view.css index 99d24e8..99d24e8 100644 --- a/chrome/browser/resources/options2/cookies_view.css +++ b/chrome/browser/resources/options/cookies_view.css diff --git a/chrome/browser/resources/options2/cookies_view.html b/chrome/browser/resources/options/cookies_view.html index 2cc7b07..2cc7b07 100644 --- a/chrome/browser/resources/options2/cookies_view.html +++ b/chrome/browser/resources/options/cookies_view.html diff --git a/chrome/browser/resources/options2/cookies_view.js b/chrome/browser/resources/options/cookies_view.js index c80b93f..c80b93f 100644 --- a/chrome/browser/resources/options2/cookies_view.js +++ b/chrome/browser/resources/options/cookies_view.js diff --git a/chrome/browser/resources/options2/cookies_view_app.html b/chrome/browser/resources/options/cookies_view_app.html index e0db2aa..e0db2aa 100644 --- a/chrome/browser/resources/options2/cookies_view_app.html +++ b/chrome/browser/resources/options/cookies_view_app.html diff --git a/chrome/browser/resources/options2/cookies_view_app.js b/chrome/browser/resources/options/cookies_view_app.js index b9ee641..b9ee641 100644 --- a/chrome/browser/resources/options2/cookies_view_app.js +++ b/chrome/browser/resources/options/cookies_view_app.js diff --git a/chrome/browser/resources/options2/deletable_item_list.js b/chrome/browser/resources/options/deletable_item_list.js index 8d79902..8d79902 100644 --- a/chrome/browser/resources/options2/deletable_item_list.js +++ b/chrome/browser/resources/options/deletable_item_list.js diff --git a/chrome/browser/resources/options2/editable_text_field.js b/chrome/browser/resources/options/editable_text_field.js index 7f578b4..7f578b4 100644 --- a/chrome/browser/resources/options2/editable_text_field.js +++ b/chrome/browser/resources/options/editable_text_field.js diff --git a/chrome/browser/resources/options2/font_settings.css b/chrome/browser/resources/options/font_settings.css index 6cd5ca4..6cd5ca4 100644 --- a/chrome/browser/resources/options2/font_settings.css +++ b/chrome/browser/resources/options/font_settings.css diff --git a/chrome/browser/resources/options2/font_settings.html b/chrome/browser/resources/options/font_settings.html index ec69c70..ec69c70 100644 --- a/chrome/browser/resources/options2/font_settings.html +++ b/chrome/browser/resources/options/font_settings.html diff --git a/chrome/browser/resources/options2/font_settings.js b/chrome/browser/resources/options/font_settings.js index df02798..df02798 100644 --- a/chrome/browser/resources/options2/font_settings.js +++ b/chrome/browser/resources/options/font_settings.js diff --git a/chrome/browser/resources/options2/handler_options.css b/chrome/browser/resources/options/handler_options.css index 116e5e7..116e5e7 100644 --- a/chrome/browser/resources/options2/handler_options.css +++ b/chrome/browser/resources/options/handler_options.css diff --git a/chrome/browser/resources/options2/handler_options.html b/chrome/browser/resources/options/handler_options.html index ffa95b7..ffa95b7 100644 --- a/chrome/browser/resources/options2/handler_options.html +++ b/chrome/browser/resources/options/handler_options.html diff --git a/chrome/browser/resources/options2/handler_options.js b/chrome/browser/resources/options/handler_options.js index c3d641a..c3d641a 100644 --- a/chrome/browser/resources/options2/handler_options.js +++ b/chrome/browser/resources/options/handler_options.js diff --git a/chrome/browser/resources/options2/handler_options_list.js b/chrome/browser/resources/options/handler_options_list.js index 93c139a..93c139a 100644 --- a/chrome/browser/resources/options2/handler_options_list.js +++ b/chrome/browser/resources/options/handler_options_list.js diff --git a/chrome/browser/resources/options2/home_page_overlay.css b/chrome/browser/resources/options/home_page_overlay.css index bcece11..bcece11 100644 --- a/chrome/browser/resources/options2/home_page_overlay.css +++ b/chrome/browser/resources/options/home_page_overlay.css diff --git a/chrome/browser/resources/options2/home_page_overlay.html b/chrome/browser/resources/options/home_page_overlay.html index 2329507..2329507 100644 --- a/chrome/browser/resources/options2/home_page_overlay.html +++ b/chrome/browser/resources/options/home_page_overlay.html diff --git a/chrome/browser/resources/options2/home_page_overlay.js b/chrome/browser/resources/options/home_page_overlay.js index 9753ab4..9753ab4 100644 --- a/chrome/browser/resources/options2/home_page_overlay.js +++ b/chrome/browser/resources/options/home_page_overlay.js diff --git a/chrome/browser/resources/options2/import_data_overlay.css b/chrome/browser/resources/options/import_data_overlay.css index 6cb5262..6cb5262 100644 --- a/chrome/browser/resources/options2/import_data_overlay.css +++ b/chrome/browser/resources/options/import_data_overlay.css diff --git a/chrome/browser/resources/options2/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html index 2f5880a..2f5880a 100644 --- a/chrome/browser/resources/options2/import_data_overlay.html +++ b/chrome/browser/resources/options/import_data_overlay.html diff --git a/chrome/browser/resources/options2/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js index 1a38402..1a38402 100644 --- a/chrome/browser/resources/options2/import_data_overlay.js +++ b/chrome/browser/resources/options/import_data_overlay.js diff --git a/chrome/browser/resources/options2/inline_editable_list.js b/chrome/browser/resources/options/inline_editable_list.js index c9d6a93..c9d6a93 100644 --- a/chrome/browser/resources/options2/inline_editable_list.js +++ b/chrome/browser/resources/options/inline_editable_list.js diff --git a/chrome/browser/resources/options2/instant_confirm_overlay.css b/chrome/browser/resources/options/instant_confirm_overlay.css index 3f6d77f..3f6d77f 100644 --- a/chrome/browser/resources/options2/instant_confirm_overlay.css +++ b/chrome/browser/resources/options/instant_confirm_overlay.css diff --git a/chrome/browser/resources/options2/instant_confirm_overlay.html b/chrome/browser/resources/options/instant_confirm_overlay.html index 54653b2..54653b2 100644 --- a/chrome/browser/resources/options2/instant_confirm_overlay.html +++ b/chrome/browser/resources/options/instant_confirm_overlay.html diff --git a/chrome/browser/resources/options2/instant_confirm_overlay.js b/chrome/browser/resources/options/instant_confirm_overlay.js index 6cadd5c..6cadd5c 100644 --- a/chrome/browser/resources/options2/instant_confirm_overlay.js +++ b/chrome/browser/resources/options/instant_confirm_overlay.js diff --git a/chrome/browser/resources/options2/language_add_language_overlay.html b/chrome/browser/resources/options/language_add_language_overlay.html index 45a68c0..45a68c0 100644 --- a/chrome/browser/resources/options2/language_add_language_overlay.html +++ b/chrome/browser/resources/options/language_add_language_overlay.html diff --git a/chrome/browser/resources/options2/language_add_language_overlay.js b/chrome/browser/resources/options/language_add_language_overlay.js index d5ebf93..d5ebf93 100644 --- a/chrome/browser/resources/options2/language_add_language_overlay.js +++ b/chrome/browser/resources/options/language_add_language_overlay.js diff --git a/chrome/browser/resources/options2/language_list.js b/chrome/browser/resources/options/language_list.js index e036490..e036490 100644 --- a/chrome/browser/resources/options2/language_list.js +++ b/chrome/browser/resources/options/language_list.js diff --git a/chrome/browser/resources/options2/language_options.css b/chrome/browser/resources/options/language_options.css index 470788d..470788d 100644 --- a/chrome/browser/resources/options2/language_options.css +++ b/chrome/browser/resources/options/language_options.css diff --git a/chrome/browser/resources/options2/language_options.html b/chrome/browser/resources/options/language_options.html index c668018..c668018 100644 --- a/chrome/browser/resources/options2/language_options.html +++ b/chrome/browser/resources/options/language_options.html diff --git a/chrome/browser/resources/options2/language_options.js b/chrome/browser/resources/options/language_options.js index 4beb0f5..4beb0f5 100644 --- a/chrome/browser/resources/options2/language_options.js +++ b/chrome/browser/resources/options/language_options.js diff --git a/chrome/browser/resources/options2/manage_profile_overlay.css b/chrome/browser/resources/options/manage_profile_overlay.css index 8c17101..8c17101 100644 --- a/chrome/browser/resources/options2/manage_profile_overlay.css +++ b/chrome/browser/resources/options/manage_profile_overlay.css diff --git a/chrome/browser/resources/options2/manage_profile_overlay.html b/chrome/browser/resources/options/manage_profile_overlay.html index 3170dcc..3170dcc 100644 --- a/chrome/browser/resources/options2/manage_profile_overlay.html +++ b/chrome/browser/resources/options/manage_profile_overlay.html diff --git a/chrome/browser/resources/options2/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js index c4997f7..c4997f7 100644 --- a/chrome/browser/resources/options2/manage_profile_overlay.js +++ b/chrome/browser/resources/options/manage_profile_overlay.js diff --git a/chrome/browser/resources/options2/media_galleries_list.js b/chrome/browser/resources/options/media_galleries_list.js index 417084b..417084b 100644 --- a/chrome/browser/resources/options2/media_galleries_list.js +++ b/chrome/browser/resources/options/media_galleries_list.js diff --git a/chrome/browser/resources/options2/media_galleries_manager_overlay.html b/chrome/browser/resources/options/media_galleries_manager_overlay.html index 5f4e10d..5f4e10d 100644 --- a/chrome/browser/resources/options2/media_galleries_manager_overlay.html +++ b/chrome/browser/resources/options/media_galleries_manager_overlay.html diff --git a/chrome/browser/resources/options2/media_galleries_manager_overlay.js b/chrome/browser/resources/options/media_galleries_manager_overlay.js index e1a24ff..e1a24ff 100644 --- a/chrome/browser/resources/options2/media_galleries_manager_overlay.js +++ b/chrome/browser/resources/options/media_galleries_manager_overlay.js diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options/options.html index c5bcac0..c5bcac0 100644 --- a/chrome/browser/resources/options2/options.html +++ b/chrome/browser/resources/options/options.html diff --git a/chrome/browser/resources/options2/options.js b/chrome/browser/resources/options/options.js index 487c517..487c517 100644 --- a/chrome/browser/resources/options2/options.js +++ b/chrome/browser/resources/options/options.js diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options/options_bundle.js index 2bbd43d47..2bbd43d47 100644 --- a/chrome/browser/resources/options2/options_bundle.js +++ b/chrome/browser/resources/options/options_bundle.js diff --git a/chrome/browser/resources/options2/options_focus_manager.js b/chrome/browser/resources/options/options_focus_manager.js index d608141..d608141 100644 --- a/chrome/browser/resources/options2/options_focus_manager.js +++ b/chrome/browser/resources/options/options_focus_manager.js diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options/options_page.css index 90d9c70..90d9c70 100644 --- a/chrome/browser/resources/options2/options_page.css +++ b/chrome/browser/resources/options/options_page.css diff --git a/chrome/browser/resources/options2/options_page.js b/chrome/browser/resources/options/options_page.js index 7401694..7401694 100644 --- a/chrome/browser/resources/options2/options_page.js +++ b/chrome/browser/resources/options/options_page.js diff --git a/chrome/browser/resources/options2/password_manager.css b/chrome/browser/resources/options/password_manager.css index 18314ef..18314ef 100644 --- a/chrome/browser/resources/options2/password_manager.css +++ b/chrome/browser/resources/options/password_manager.css diff --git a/chrome/browser/resources/options2/password_manager.html b/chrome/browser/resources/options/password_manager.html index 656e786..656e786 100644 --- a/chrome/browser/resources/options2/password_manager.html +++ b/chrome/browser/resources/options/password_manager.html diff --git a/chrome/browser/resources/options2/password_manager.js b/chrome/browser/resources/options/password_manager.js index 43b5e44..43b5e44 100644 --- a/chrome/browser/resources/options2/password_manager.js +++ b/chrome/browser/resources/options/password_manager.js diff --git a/chrome/browser/resources/options2/password_manager_list.css b/chrome/browser/resources/options/password_manager_list.css index 8688619..8688619 100644 --- a/chrome/browser/resources/options2/password_manager_list.css +++ b/chrome/browser/resources/options/password_manager_list.css diff --git a/chrome/browser/resources/options2/password_manager_list.js b/chrome/browser/resources/options/password_manager_list.js index 483c271..483c271 100644 --- a/chrome/browser/resources/options2/password_manager_list.js +++ b/chrome/browser/resources/options/password_manager_list.js diff --git a/chrome/browser/resources/options2/pref_ui.js b/chrome/browser/resources/options/pref_ui.js index 82bab86..82bab86 100644 --- a/chrome/browser/resources/options2/pref_ui.js +++ b/chrome/browser/resources/options/pref_ui.js diff --git a/chrome/browser/resources/options2/preferences.js b/chrome/browser/resources/options/preferences.js index 807e45e..807e45e 100644 --- a/chrome/browser/resources/options2/preferences.js +++ b/chrome/browser/resources/options/preferences.js diff --git a/chrome/browser/resources/options2/profiles_icon_grid.js b/chrome/browser/resources/options/profiles_icon_grid.js index 287231c..287231c 100644 --- a/chrome/browser/resources/options2/profiles_icon_grid.js +++ b/chrome/browser/resources/options/profiles_icon_grid.js diff --git a/chrome/browser/resources/options2/search_box.html b/chrome/browser/resources/options/search_box.html index f27e1e7..f27e1e7 100644 --- a/chrome/browser/resources/options2/search_box.html +++ b/chrome/browser/resources/options/search_box.html diff --git a/chrome/browser/resources/options2/search_engine_manager.css b/chrome/browser/resources/options/search_engine_manager.css index f9c17c8..f9c17c8 100644 --- a/chrome/browser/resources/options2/search_engine_manager.css +++ b/chrome/browser/resources/options/search_engine_manager.css diff --git a/chrome/browser/resources/options2/search_engine_manager.html b/chrome/browser/resources/options/search_engine_manager.html index 0e300b2..0e300b2 100644 --- a/chrome/browser/resources/options2/search_engine_manager.html +++ b/chrome/browser/resources/options/search_engine_manager.html diff --git a/chrome/browser/resources/options2/search_engine_manager.js b/chrome/browser/resources/options/search_engine_manager.js index f986aa1..f986aa1 100644 --- a/chrome/browser/resources/options2/search_engine_manager.js +++ b/chrome/browser/resources/options/search_engine_manager.js diff --git a/chrome/browser/resources/options2/search_engine_manager_engine_list.js b/chrome/browser/resources/options/search_engine_manager_engine_list.js index 9d6b5ae..9d6b5ae 100644 --- a/chrome/browser/resources/options2/search_engine_manager_engine_list.js +++ b/chrome/browser/resources/options/search_engine_manager_engine_list.js diff --git a/chrome/browser/resources/options2/search_page.css b/chrome/browser/resources/options/search_page.css index 18b0fb1..18b0fb1 100644 --- a/chrome/browser/resources/options2/search_page.css +++ b/chrome/browser/resources/options/search_page.css diff --git a/chrome/browser/resources/options2/search_page.html b/chrome/browser/resources/options/search_page.html index 073c505..073c505 100644 --- a/chrome/browser/resources/options2/search_page.html +++ b/chrome/browser/resources/options/search_page.html diff --git a/chrome/browser/resources/options2/search_page.js b/chrome/browser/resources/options/search_page.js index ac28df4..ac28df4 100644 --- a/chrome/browser/resources/options2/search_page.js +++ b/chrome/browser/resources/options/search_page.js diff --git a/chrome/browser/resources/options2/settings_dialog.js b/chrome/browser/resources/options/settings_dialog.js index 609bbaa..609bbaa 100644 --- a/chrome/browser/resources/options2/settings_dialog.js +++ b/chrome/browser/resources/options/settings_dialog.js diff --git a/chrome/browser/resources/options2/spelling_confirm_overlay.css b/chrome/browser/resources/options/spelling_confirm_overlay.css index 434c26c..434c26c 100644 --- a/chrome/browser/resources/options2/spelling_confirm_overlay.css +++ b/chrome/browser/resources/options/spelling_confirm_overlay.css diff --git a/chrome/browser/resources/options2/spelling_confirm_overlay.html b/chrome/browser/resources/options/spelling_confirm_overlay.html index d58ce10..d58ce10 100644 --- a/chrome/browser/resources/options2/spelling_confirm_overlay.html +++ b/chrome/browser/resources/options/spelling_confirm_overlay.html diff --git a/chrome/browser/resources/options2/spelling_confirm_overlay.js b/chrome/browser/resources/options/spelling_confirm_overlay.js index 86e6598..86e6598 100644 --- a/chrome/browser/resources/options2/spelling_confirm_overlay.js +++ b/chrome/browser/resources/options/spelling_confirm_overlay.js diff --git a/chrome/browser/resources/options2/startup_overlay.css b/chrome/browser/resources/options/startup_overlay.css index dc74deb..dc74deb 100644 --- a/chrome/browser/resources/options2/startup_overlay.css +++ b/chrome/browser/resources/options/startup_overlay.css diff --git a/chrome/browser/resources/options2/startup_overlay.html b/chrome/browser/resources/options/startup_overlay.html index 1ec343d..1ec343d 100644 --- a/chrome/browser/resources/options2/startup_overlay.html +++ b/chrome/browser/resources/options/startup_overlay.html diff --git a/chrome/browser/resources/options2/startup_overlay.js b/chrome/browser/resources/options/startup_overlay.js index f452ab2..f452ab2 100644 --- a/chrome/browser/resources/options2/startup_overlay.js +++ b/chrome/browser/resources/options/startup_overlay.js diff --git a/chrome/browser/resources/options2/startup_section.html b/chrome/browser/resources/options/startup_section.html index 778c870..778c870 100644 --- a/chrome/browser/resources/options2/startup_section.html +++ b/chrome/browser/resources/options/startup_section.html diff --git a/chrome/browser/resources/options2/subpages_tab_controls.css b/chrome/browser/resources/options/subpages_tab_controls.css index c49c077..c49c077 100644 --- a/chrome/browser/resources/options2/subpages_tab_controls.css +++ b/chrome/browser/resources/options/subpages_tab_controls.css diff --git a/chrome/browser/resources/options2/sync_section.html b/chrome/browser/resources/options/sync_section.html index 4f7c980..4f7c980 100644 --- a/chrome/browser/resources/options2/sync_section.html +++ b/chrome/browser/resources/options/sync_section.html diff --git a/chrome/browser/resources/options2_resources.grd b/chrome/browser/resources/options2_resources.grd deleted file mode 100644 index e4630b1..0000000 --- a/chrome/browser/resources/options2_resources.grd +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/options2_resources.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="options2_resources.pak" type="data_package" /> - </outputs> - <release seq="1"> - <structures> - <structure name="IDR_OPTIONS2_BUNDLE_JS" file="options2/options_bundle.js" flattenhtml="true" type="chrome_html" /> - <structure name="IDR_OPTIONS2_HTML" file="options2/options.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> - </structures> - </release> -</grit> diff --git a/chrome/browser/resources/options_resources.grd b/chrome/browser/resources/options_resources.grd new file mode 100644 index 0000000..fb8e4c5 --- /dev/null +++ b/chrome/browser/resources/options_resources.grd @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/options_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="options_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <structures> + <structure name="IDR_OPTIONS_BUNDLE_JS" file="options/options_bundle.js" flattenhtml="true" type="chrome_html" /> + <structure name="IDR_OPTIONS_HTML" file="options/options.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> + </structures> + </release> +</grit> diff --git a/chrome/browser/resources/sync_promo/sync_promo.js b/chrome/browser/resources/sync_promo/sync_promo.js index 4ce8299..86030d0 100644 --- a/chrome/browser/resources/sync_promo/sync_promo.js +++ b/chrome/browser/resources/sync_promo/sync_promo.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // TODO(sail): Refactor options_page and remove this include. -<include src="../options2/options_page.js"/> +<include src="../options/options_page.js"/> <include src="../shared/js/util.js"/> <include src="../sync_setup_overlay.js"/> diff --git a/chrome/browser/resources/web_dev_style/js_checker.py b/chrome/browser/resources/web_dev_style/js_checker.py index c065e36..66cb9e1 100644 --- a/chrome/browser/resources/web_dev_style/js_checker.py +++ b/chrome/browser/resources/web_dev_style/js_checker.py @@ -79,7 +79,7 @@ class JSChecker(object): path.join(resources, 'net_internals'), path.join(resources, 'network_action_predictor'), path.join(resources, 'ntp4'), - path.join(resources, 'options2'), + path.join(resources, 'options'), path.join(resources, 'print_preview'), path.join(resources, 'profiler'), path.join(resources, 'sync_promo'), diff --git a/chrome/browser/ui/webui/options2/options_ui.cc b/chrome/browser/ui/webui/options2/options_ui.cc index a8f55ae..54bdf70 100644 --- a/chrome/browser/ui/webui/options2/options_ui.cc +++ b/chrome/browser/ui/webui/options2/options_ui.cc @@ -54,7 +54,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "grit/options2_resources.h" +#include "grit/options_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" #include "ui/base/layout.h" @@ -148,11 +148,11 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path, } else if (path == kOptionsBundleJsFile) { // Return (and cache) the options javascript code. response_bytes = ui::ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_OPTIONS2_BUNDLE_JS, ui::SCALE_FACTOR_NONE); + LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS, ui::SCALE_FACTOR_NONE); } else { // Return (and cache) the main options html page as the default. response_bytes = ui::ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_OPTIONS2_HTML, ui::SCALE_FACTOR_NONE); + LoadDataResourceBytes(IDR_OPTIONS_HTML, ui::SCALE_FACTOR_NONE); } SendResponse(request_id, response_bytes); diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 102fdb4..fe6d9af 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -32,9 +32,9 @@ 'includes': [ '../build/grit_action.gypi' ], }, { - 'action_name': 'options2_resources', + 'action_name': 'options_resources', 'variables': { - 'grit_grd_file': 'browser/resources/options2_resources.grd', + 'grit_grd_file': 'browser/resources/options_resources.grd', }, 'includes': [ '../build/grit_action.gypi' ], }, |