Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9220)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 300d56fc9291a0c86ce15517a768a8edec18ec9e..77606a94b5082df01170f4886da06b5114ddcaa5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4132,98 +4132,98 @@
'browser/ui/webui/omnibox/omnibox_ui.h',
'browser/ui/webui/omnibox/omnibox_ui_handler.cc',
'browser/ui/webui/omnibox/omnibox_ui_handler.h',
- 'browser/ui/webui/options2/advanced_options_utils.h',
- 'browser/ui/webui/options2/advanced_options_utils_mac.mm',
- 'browser/ui/webui/options2/advanced_options_utils_win.cc',
- 'browser/ui/webui/options2/advanced_options_utils_x11.cc',
- 'browser/ui/webui/options2/autofill_options_handler.cc',
- 'browser/ui/webui/options2/autofill_options_handler.h',
- 'browser/ui/webui/options2/browser_options_handler.cc',
- 'browser/ui/webui/options2/browser_options_handler.h',
- 'browser/ui/webui/options2/certificate_manager_handler.cc',
- 'browser/ui/webui/options2/certificate_manager_handler.h',
- 'browser/ui/webui/options2/chromeos/accounts_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/accounts_options_handler.h',
- 'browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/bluetooth_options_handler.h',
- 'browser/ui/webui/options2/chromeos/change_picture_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/change_picture_options_handler.h',
- 'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h',
- 'browser/ui/webui/options2/chromeos/cros_language_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/cros_language_options_handler.h',
- 'browser/ui/webui/options2/chromeos/display_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/display_options_handler.h',
- 'browser/ui/webui/options2/chromeos/internet_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/internet_options_handler.h',
- 'browser/ui/webui/options2/chromeos/keyboard_handler.cc',
- 'browser/ui/webui/options2/chromeos/keyboard_handler.h',
- 'browser/ui/webui/options2/chromeos/language_chewing_handler.cc',
- 'browser/ui/webui/options2/chromeos/language_chewing_handler.h',
- 'browser/ui/webui/options2/chromeos/language_hangul_handler.cc',
- 'browser/ui/webui/options2/chromeos/language_hangul_handler.h',
- 'browser/ui/webui/options2/chromeos/language_mozc_handler.cc',
- 'browser/ui/webui/options2/chromeos/language_mozc_handler.h',
- 'browser/ui/webui/options2/chromeos/language_options_util.cc',
- 'browser/ui/webui/options2/chromeos/language_options_util.h',
- 'browser/ui/webui/options2/chromeos/language_pinyin_handler.cc',
- 'browser/ui/webui/options2/chromeos/language_pinyin_handler.h',
- 'browser/ui/webui/options2/chromeos/pointer_handler.cc',
- 'browser/ui/webui/options2/chromeos/pointer_handler.h',
- 'browser/ui/webui/options2/chromeos/proxy_handler.cc',
- 'browser/ui/webui/options2/chromeos/proxy_handler.h',
- 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h',
- 'browser/ui/webui/options2/chromeos/stats_options_handler.cc',
- 'browser/ui/webui/options2/chromeos/stats_options_handler.h',
- 'browser/ui/webui/options2/chromeos/timezone_options_util.cc',
- 'browser/ui/webui/options2/chromeos/timezone_options_util.h',
- 'browser/ui/webui/options2/chromeos/user_image_source.cc',
- 'browser/ui/webui/options2/chromeos/user_image_source.h',
- 'browser/ui/webui/options2/chromeos/wallpaper_source.cc',
- 'browser/ui/webui/options2/chromeos/wallpaper_source.h',
- 'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.cc',
- 'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h',
- 'browser/ui/webui/options2/clear_browser_data_handler.cc',
- 'browser/ui/webui/options2/clear_browser_data_handler.h',
- 'browser/ui/webui/options2/content_settings_handler.cc',
- 'browser/ui/webui/options2/content_settings_handler.h',
- 'browser/ui/webui/options2/cookies_view_handler.cc',
- 'browser/ui/webui/options2/cookies_view_handler.h',
- 'browser/ui/webui/options2/core_options_handler.cc',
- 'browser/ui/webui/options2/core_options_handler.h',
- 'browser/ui/webui/options2/font_settings_handler.cc',
- 'browser/ui/webui/options2/font_settings_handler.h',
- 'browser/ui/webui/options2/font_settings_utils.h',
- 'browser/ui/webui/options2/font_settings_utils_mac.mm',
- 'browser/ui/webui/options2/font_settings_utils_win.cc',
- 'browser/ui/webui/options2/font_settings_utils_x11.cc',
- 'browser/ui/webui/options2/handler_options_handler.cc',
- 'browser/ui/webui/options2/handler_options_handler.h',
- 'browser/ui/webui/options2/home_page_overlay_handler.cc',
- 'browser/ui/webui/options2/home_page_overlay_handler.h',
- 'browser/ui/webui/options2/import_data_handler.cc',
- 'browser/ui/webui/options2/import_data_handler.h',
- 'browser/ui/webui/options2/language_options_handler.cc',
- 'browser/ui/webui/options2/language_options_handler.h',
- 'browser/ui/webui/options2/language_options_handler_common.cc',
- 'browser/ui/webui/options2/language_options_handler_common.h',
- 'browser/ui/webui/options2/manage_profile_handler.cc',
- 'browser/ui/webui/options2/manage_profile_handler.h',
- 'browser/ui/webui/options2/media_galleries_handler.cc',
- 'browser/ui/webui/options2/media_galleries_handler.h',
- 'browser/ui/webui/options2/options_sync_setup_handler.cc',
- 'browser/ui/webui/options2/options_sync_setup_handler.h',
- 'browser/ui/webui/options2/options_ui.cc',
- 'browser/ui/webui/options2/options_ui.h',
- 'browser/ui/webui/options2/password_manager_handler.cc',
- 'browser/ui/webui/options2/password_manager_handler.h',
- 'browser/ui/webui/options2/search_engine_manager_handler.cc',
- 'browser/ui/webui/options2/search_engine_manager_handler.h',
- 'browser/ui/webui/options2/startup_pages_handler.cc',
- 'browser/ui/webui/options2/startup_pages_handler.h',
- 'browser/ui/webui/options2/web_intents_settings_handler.cc',
- 'browser/ui/webui/options2/web_intents_settings_handler.h',
+ 'browser/ui/webui/options/advanced_options_utils.h',
+ 'browser/ui/webui/options/advanced_options_utils_mac.mm',
+ 'browser/ui/webui/options/advanced_options_utils_win.cc',
+ 'browser/ui/webui/options/advanced_options_utils_x11.cc',
+ 'browser/ui/webui/options/autofill_options_handler.cc',
+ 'browser/ui/webui/options/autofill_options_handler.h',
+ 'browser/ui/webui/options/browser_options_handler.cc',
+ 'browser/ui/webui/options/browser_options_handler.h',
+ 'browser/ui/webui/options/certificate_manager_handler.cc',
+ 'browser/ui/webui/options/certificate_manager_handler.h',
+ 'browser/ui/webui/options/chromeos/accounts_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/accounts_options_handler.h',
+ 'browser/ui/webui/options/chromeos/bluetooth_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/bluetooth_options_handler.h',
+ 'browser/ui/webui/options/chromeos/change_picture_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/change_picture_options_handler.h',
+ 'browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/core_chromeos_options_handler.h',
+ 'browser/ui/webui/options/chromeos/cros_language_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/cros_language_options_handler.h',
+ 'browser/ui/webui/options/chromeos/display_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/display_options_handler.h',
+ 'browser/ui/webui/options/chromeos/internet_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/internet_options_handler.h',
+ 'browser/ui/webui/options/chromeos/keyboard_handler.cc',
+ 'browser/ui/webui/options/chromeos/keyboard_handler.h',
+ 'browser/ui/webui/options/chromeos/language_chewing_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_chewing_handler.h',
+ 'browser/ui/webui/options/chromeos/language_hangul_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_hangul_handler.h',
+ 'browser/ui/webui/options/chromeos/language_mozc_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_mozc_handler.h',
+ 'browser/ui/webui/options/chromeos/language_options_util.cc',
+ 'browser/ui/webui/options/chromeos/language_options_util.h',
+ 'browser/ui/webui/options/chromeos/language_pinyin_handler.cc',
+ 'browser/ui/webui/options/chromeos/language_pinyin_handler.h',
+ 'browser/ui/webui/options/chromeos/pointer_handler.cc',
+ 'browser/ui/webui/options/chromeos/pointer_handler.h',
+ 'browser/ui/webui/options/chromeos/proxy_handler.cc',
+ 'browser/ui/webui/options/chromeos/proxy_handler.h',
+ 'browser/ui/webui/options/chromeos/set_wallpaper_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/set_wallpaper_options_handler.h',
+ 'browser/ui/webui/options/chromeos/stats_options_handler.cc',
+ 'browser/ui/webui/options/chromeos/stats_options_handler.h',
+ 'browser/ui/webui/options/chromeos/timezone_options_util.cc',
+ 'browser/ui/webui/options/chromeos/timezone_options_util.h',
+ 'browser/ui/webui/options/chromeos/user_image_source.cc',
+ 'browser/ui/webui/options/chromeos/user_image_source.h',
+ 'browser/ui/webui/options/chromeos/wallpaper_source.cc',
+ 'browser/ui/webui/options/chromeos/wallpaper_source.h',
+ 'browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc',
+ 'browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.h',
+ 'browser/ui/webui/options/clear_browser_data_handler.cc',
+ 'browser/ui/webui/options/clear_browser_data_handler.h',
+ 'browser/ui/webui/options/content_settings_handler.cc',
+ 'browser/ui/webui/options/content_settings_handler.h',
+ 'browser/ui/webui/options/cookies_view_handler.cc',
+ 'browser/ui/webui/options/cookies_view_handler.h',
+ 'browser/ui/webui/options/core_options_handler.cc',
+ 'browser/ui/webui/options/core_options_handler.h',
+ 'browser/ui/webui/options/font_settings_handler.cc',
+ 'browser/ui/webui/options/font_settings_handler.h',
+ 'browser/ui/webui/options/font_settings_utils.h',
+ 'browser/ui/webui/options/font_settings_utils_mac.mm',
+ 'browser/ui/webui/options/font_settings_utils_win.cc',
+ 'browser/ui/webui/options/font_settings_utils_x11.cc',
+ 'browser/ui/webui/options/handler_options_handler.cc',
+ 'browser/ui/webui/options/handler_options_handler.h',
+ 'browser/ui/webui/options/home_page_overlay_handler.cc',
+ 'browser/ui/webui/options/home_page_overlay_handler.h',
+ 'browser/ui/webui/options/import_data_handler.cc',
+ 'browser/ui/webui/options/import_data_handler.h',
+ 'browser/ui/webui/options/language_options_handler.cc',
+ 'browser/ui/webui/options/language_options_handler.h',
+ 'browser/ui/webui/options/language_options_handler_common.cc',
+ 'browser/ui/webui/options/language_options_handler_common.h',
+ 'browser/ui/webui/options/manage_profile_handler.cc',
+ 'browser/ui/webui/options/manage_profile_handler.h',
+ 'browser/ui/webui/options/media_galleries_handler.cc',
+ 'browser/ui/webui/options/media_galleries_handler.h',
+ 'browser/ui/webui/options/options_sync_setup_handler.cc',
+ 'browser/ui/webui/options/options_sync_setup_handler.h',
+ 'browser/ui/webui/options/options_ui.cc',
+ 'browser/ui/webui/options/options_ui.h',
+ 'browser/ui/webui/options/password_manager_handler.cc',
+ 'browser/ui/webui/options/password_manager_handler.h',
+ 'browser/ui/webui/options/search_engine_manager_handler.cc',
+ 'browser/ui/webui/options/search_engine_manager_handler.h',
+ 'browser/ui/webui/options/startup_pages_handler.cc',
+ 'browser/ui/webui/options/startup_pages_handler.h',
+ 'browser/ui/webui/options/web_intents_settings_handler.cc',
+ 'browser/ui/webui/options/web_intents_settings_handler.h',
'browser/ui/webui/performance_monitor/web_ui.cc',
'browser/ui/webui/performance_monitor/web_ui.h',
'browser/ui/webui/performance_monitor/web_ui_handler.cc',
@@ -4570,7 +4570,7 @@
'sources/': [
['exclude', '^browser/chromeos'],
['exclude', '^browser/ui/webui/chromeos'],
- ['exclude', '^browser/ui/webui/options2/chromeos'],
+ ['exclude', '^browser/ui/webui/options/chromeos'],
['exclude', 'browser/download/download_file_picker_chromeos.cc'],
['exclude', 'browser/download/download_file_picker_chromeos.h'],
['exclude', 'browser/download/save_package_file_picker_chromeos.cc'],
@@ -4878,8 +4878,8 @@
'sources!': [
'browser/certificate_manager_model.cc',
'browser/certificate_manager_model.h',
- 'browser/ui/webui/options2/certificate_manager_handler.cc',
- 'browser/ui/webui/options2/certificate_manager_handler.h',
+ 'browser/ui/webui/options/certificate_manager_handler.cc',
+ 'browser/ui/webui/options/certificate_manager_handler.h',
],
}],
['use_nss==0 and use_openssl==0', {
@@ -5079,7 +5079,7 @@
['exclude', '^browser/ui/webui/help/'],
['exclude', '^browser/ui/webui/inspect_'],
['exclude', '^browser/ui/webui/options'],
- ['exclude', '^browser/ui/webui/options2'],
+ ['exclude', '^browser/ui/webui/options'],
['exclude', '^browser/ui/webui/signin/'],
['exclude', '^browser/ui/webui/suggestions_internals'],
['exclude', '^browser/ui/webui/sync_promo'],
« no previous file with comments | « chrome/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698