| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index 565c687f30c5b9b34a2e8eb0c232bbe53d1b4d56..0678a9609283d46bebe0267705edb0f4a0f2d140 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -868,55 +868,28 @@
|
| 'browser/dom_ui/ntp_login_handler.h',
|
| 'browser/dom_ui/ntp_resource_cache.cc',
|
| 'browser/dom_ui/ntp_resource_cache.h',
|
| - 'browser/dom_ui/options/about_page_handler.cc',
|
| 'browser/dom_ui/options/about_page_handler.h',
|
| - 'browser/dom_ui/options/add_startup_page_handler.cc',
|
| 'browser/dom_ui/options/add_startup_page_handler.h',
|
| - 'browser/dom_ui/options/advanced_options_handler.cc',
|
| 'browser/dom_ui/options/advanced_options_handler.h',
|
| 'browser/dom_ui/options/advanced_options_utils.h',
|
| - 'browser/dom_ui/options/advanced_options_utils_gtk.cc',
|
| - 'browser/dom_ui/options/advanced_options_utils_mac.mm',
|
| - 'browser/dom_ui/options/advanced_options_utils_win.cc',
|
| - 'browser/dom_ui/options/autofill_options_handler.cc',
|
| 'browser/dom_ui/options/autofill_options_handler.h',
|
| - 'browser/dom_ui/options/browser_options_handler.cc',
|
| 'browser/dom_ui/options/browser_options_handler.h',
|
| - 'browser/dom_ui/options/certificate_manager_handler.cc',
|
| 'browser/dom_ui/options/certificate_manager_handler.h',
|
| - 'browser/dom_ui/options/clear_browser_data_handler.cc',
|
| 'browser/dom_ui/options/clear_browser_data_handler.h',
|
| - 'browser/dom_ui/options/content_settings_handler.cc',
|
| 'browser/dom_ui/options/content_settings_handler.h',
|
| - 'browser/dom_ui/options/cookies_view_handler.cc',
|
| 'browser/dom_ui/options/cookies_view_handler.h',
|
| - 'browser/dom_ui/options/core_options_handler.cc',
|
| 'browser/dom_ui/options/core_options_handler.h',
|
| - 'browser/dom_ui/options/dom_options_util.cc',
|
| 'browser/dom_ui/options/dom_options_util.h',
|
| - 'browser/dom_ui/options/font_settings_handler.cc',
|
| 'browser/dom_ui/options/font_settings_handler.h',
|
| 'browser/dom_ui/options/font_settings_utils.h',
|
| - 'browser/dom_ui/options/font_settings_utils_gtk.cc',
|
| - 'browser/dom_ui/options/font_settings_utils_mac.mm',
|
| - 'browser/dom_ui/options/font_settings_utils_win.cc',
|
| - 'browser/dom_ui/options/import_data_handler.cc',
|
| 'browser/dom_ui/options/import_data_handler.h',
|
| - 'browser/dom_ui/options/language_options_handler.cc',
|
| 'browser/dom_ui/options/language_options_handler.h',
|
| - 'browser/dom_ui/options/language_options_handler_common.cc',
|
| 'browser/dom_ui/options/language_options_handler_common.h',
|
| - 'browser/dom_ui/options/options_managed_banner_handler.cc',
|
| 'browser/dom_ui/options/options_managed_banner_handler.h',
|
| - 'browser/dom_ui/options/options_ui.cc',
|
| 'browser/dom_ui/options/options_ui.h',
|
| - 'browser/dom_ui/options/password_manager_handler.cc',
|
| 'browser/dom_ui/options/password_manager_handler.h',
|
| - 'browser/dom_ui/options/personal_options_handler.cc',
|
| 'browser/dom_ui/options/personal_options_handler.h',
|
| - 'browser/dom_ui/options/search_engine_manager_handler.cc',
|
| 'browser/dom_ui/options/search_engine_manager_handler.h',
|
| - 'browser/dom_ui/options/stop_syncing_handler.cc',
|
| 'browser/dom_ui/options/stop_syncing_handler.h',
|
| 'browser/dom_ui/print_preview_handler.cc',
|
| 'browser/dom_ui/print_preview_handler.h',
|
| @@ -3562,6 +3535,56 @@
|
| 'browser/webui/mediaplayer_ui.h',
|
| 'browser/webui/net_internals_ui.cc',
|
| 'browser/webui/net_internals_ui.h',
|
| + 'browser/webui/options/about_page_handler.cc',
|
| + 'browser/webui/options/about_page_handler.h',
|
| + 'browser/webui/options/add_startup_page_handler.cc',
|
| + 'browser/webui/options/add_startup_page_handler.h',
|
| + 'browser/webui/options/advanced_options_handler.cc',
|
| + 'browser/webui/options/advanced_options_handler.h',
|
| + 'browser/webui/options/advanced_options_utils.h',
|
| + 'browser/webui/options/advanced_options_utils_gtk.cc',
|
| + 'browser/webui/options/advanced_options_utils_mac.mm',
|
| + 'browser/webui/options/advanced_options_utils_win.cc',
|
| + 'browser/webui/options/autofill_options_handler.cc',
|
| + 'browser/webui/options/autofill_options_handler.h',
|
| + 'browser/webui/options/browser_options_handler.cc',
|
| + 'browser/webui/options/browser_options_handler.h',
|
| + 'browser/webui/options/certificate_manager_handler.cc',
|
| + 'browser/webui/options/certificate_manager_handler.h',
|
| + 'browser/webui/options/clear_browser_data_handler.cc',
|
| + 'browser/webui/options/clear_browser_data_handler.h',
|
| + 'browser/webui/options/content_settings_handler.cc',
|
| + 'browser/webui/options/content_settings_handler.h',
|
| + 'browser/webui/options/cookies_view_handler.cc',
|
| + 'browser/webui/options/cookies_view_handler.h',
|
| + 'browser/webui/options/core_options_handler.cc',
|
| + 'browser/webui/options/core_options_handler.h',
|
| + 'browser/webui/options/dom_options_util.cc',
|
| + 'browser/webui/options/dom_options_util.h',
|
| + 'browser/webui/options/font_settings_handler.cc',
|
| + 'browser/webui/options/font_settings_handler.h',
|
| + 'browser/webui/options/font_settings_utils.h',
|
| + 'browser/webui/options/font_settings_utils_gtk.cc',
|
| + 'browser/webui/options/font_settings_utils_mac.mm',
|
| + 'browser/webui/options/font_settings_utils_win.cc',
|
| + 'browser/webui/options/import_data_handler.cc',
|
| + 'browser/webui/options/import_data_handler.h',
|
| + 'browser/webui/options/language_options_handler.cc',
|
| + 'browser/webui/options/language_options_handler.h',
|
| + 'browser/webui/options/language_options_handler_common.cc',
|
| + 'browser/webui/options/language_options_handler_common.h',
|
| + 'browser/webui/options/options_managed_banner_handler.cc',
|
| + 'browser/webui/options/options_managed_banner_handler.h',
|
| + 'browser/webui/options/options_ui.cc',
|
| + 'browser/webui/options/options_ui.h',
|
| + 'browser/webui/options/password_manager_handler.cc',
|
| + 'browser/webui/options/password_manager_handler.h',
|
| + 'browser/webui/options/personal_options_handler.cc',
|
| + 'browser/webui/options/personal_options_handler.h',
|
| + 'browser/webui/options/search_engine_manager_handler.cc',
|
| + 'browser/webui/options/search_engine_manager_handler.h',
|
| + 'browser/webui/options/stop_syncing_handler.cc',
|
| + 'browser/webui/options/stop_syncing_handler.h',
|
| 'browser/webui/plugins_ui.cc',
|
| 'browser/webui/plugins_ui.h',
|
| 'browser/webui/remoting_ui.cc',
|
| @@ -3734,9 +3757,9 @@
|
| # TODO(mattm): Cert manager stuff is really !USE_NSS.
|
| 'browser/certificate_manager_model.cc',
|
| 'browser/certificate_manager_model.h',
|
| - 'browser/dom_ui/options/certificate_manager_handler.cc',
|
| - 'browser/dom_ui/options/certificate_manager_handler.h',
|
| 'browser/file_path_watcher/file_path_watcher_inotify.cc',
|
| + 'browser/webui/options/certificate_manager_handler.cc',
|
| + 'browser/webui/options/certificate_manager_handler.h',
|
| ],
|
| }],
|
| ['OS=="freebsd" or OS=="openbsd"', {
|
|
|