Options: s/options2/options/.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 4114 matching lines @@
         'browser/ui/webui/ntp/suggestions_source_discovery.cc',
         'browser/ui/webui/ntp/suggestions_source_discovery.h',
         'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
         'browser/ui/webui/ntp/suggestions_source_top_sites.h',
         'browser/ui/webui/ntp/thumbnail_source.cc',
         'browser/ui/webui/ntp/thumbnail_source.h',
         'browser/ui/webui/omnibox/omnibox_ui.cc',
         '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',
         'browser/ui/webui/performance_monitor/web_ui_handler.h',
         'browser/ui/webui/plugins_ui.cc',
         'browser/ui/webui/plugins_ui.h',
         'browser/ui/webui/policy_ui.cc',
         'browser/ui/webui/policy_ui.h',
         'browser/ui/webui/predictors/predictors_handler.cc',
         'browser/ui/webui/predictors/predictors_handler.h',
@@ skipping 326 matching lines @@
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:udev',
           ],
         }],
         ['chromeos==0', {
           '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'],
             ['exclude', 'browser/download/save_package_file_picker_chromeos.h'],
             ['exclude', 'browser/extensions/api/input_ime/input_ime_api.cc'],
             ['exclude', 'browser/extensions/api/input_ime/input_ime_api.h'],
             ['exclude', 'browser/extensions/api/terminal/terminal_extension_helper.cc'],
             ['exclude', 'browser/extensions/api/terminal/terminal_extension_helper.h'],
             ['exclude', 'browser/extensions/api/terminal/terminal_private_api.cc'],
             ['exclude', 'browser/extensions/api/terminal/terminal_private_api.h'],
@@ skipping 287 matching lines @@
             'third_party/mozilla_security_manager/nsNSSCertHelper.h',
             'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
             'third_party/mozilla_security_manager/nsNSSCertificate.h',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
         }, {  # use_nss==0
           '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', {
           'sources!': [
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/certificate_viewer_webui.h',
             'browser/ui/webui/certificate_viewer_ui.cc',
             'browser/ui/webui/certificate_viewer_ui.h',
           ],
         }],
@@ skipping 179 matching lines @@
             ['exclude', '^browser/ui/omnibox/'],
             ['exclude', '^browser/ui/panels/'],
             ['exclude', '^browser/ui/tabs/'],
             ['exclude', '^browser/ui/toolbar/'],
             ['exclude', '^browser/ui/webui/downloads_'],
             ['exclude', '^browser/ui/webui/feedback_'],
             ['exclude', '^browser/ui/webui/flags_'],
             ['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'],
             ['exclude', '^browser/usb/'],
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
@@ skipping 511 matching lines @@
           'includes': [ '../build/jni_generator.gypi' ],
           'dependencies': [
             'android_jar_jni_headers',
           ],
         },
       ],
      },
     ],
   ],
 }