| Index: chrome/chrome_browser.gypi
|
| ===================================================================
|
| --- chrome/chrome_browser.gypi (revision 68014)
|
| +++ chrome/chrome_browser.gypi (working copy)
|
| @@ -260,8 +260,6 @@
|
| 'browser/automation/ui_controls_mac.mm',
|
| 'browser/automation/ui_controls_win.cc',
|
| 'browser/automation/ui_controls.h',
|
| - 'browser/back_forward_menu_model.cc',
|
| - 'browser/back_forward_menu_model.h',
|
| 'browser/background_application_list_model.cc',
|
| 'browser/background_application_list_model.h',
|
| 'browser/background_contents_service.cc',
|
| @@ -818,11 +816,6 @@
|
| 'browser/diagnostics/sqlite_diagnostics.h',
|
| 'browser/diagnostics/recon_diagnostics.cc',
|
| 'browser/diagnostics/recon_diagnostics.h',
|
| - 'browser/dock_info_gtk.cc',
|
| - 'browser/dock_info_mac.cc',
|
| - 'browser/dock_info_win.cc',
|
| - 'browser/dock_info.cc',
|
| - 'browser/dock_info.h',
|
| 'browser/dom_operation_notification_details.h',
|
| 'browser/dom_ui/app_launcher_handler.cc',
|
| 'browser/dom_ui/app_launcher_handler.h',
|
| @@ -997,8 +990,6 @@
|
| 'browser/download/save_package.h',
|
| 'browser/download/save_types.cc',
|
| 'browser/download/save_types.h',
|
| - 'browser/encoding_menu_controller.cc',
|
| - 'browser/encoding_menu_controller.h',
|
| 'browser/extensions/convert_user_script.cc',
|
| 'browser/extensions/convert_user_script.h',
|
| 'browser/extensions/convert_web_app.cc',
|
| @@ -2527,8 +2518,6 @@
|
| 'browser/themes/browser_theme_provider_mac.mm',
|
| 'browser/themes/browser_theme_provider.cc',
|
| 'browser/themes/browser_theme_provider.h',
|
| - 'browser/toolbar_model.cc',
|
| - 'browser/toolbar_model.h',
|
| 'browser/translate/languages_menu_model.cc',
|
| 'browser/translate/languages_menu_model.h',
|
| 'browser/translate/options_menu_model.cc',
|
| @@ -3022,6 +3011,19 @@
|
| 'browser/ui/find_bar/find_bar_state.h',
|
| 'browser/ui/find_bar/find_bar_state.cc',
|
| 'browser/ui/find_bar/find_notification_details.h',
|
| + 'browser/ui/tabs/dock_info_gtk.cc',
|
| + 'browser/ui/tabs/dock_info_mac.cc',
|
| + 'browser/ui/tabs/dock_info_win.cc',
|
| + 'browser/ui/tabs/dock_info.cc',
|
| + 'browser/ui/tabs/dock_info.h',
|
| + 'browser/ui/toolbar/back_forward_menu_model.cc',
|
| + 'browser/ui/toolbar/back_forward_menu_model.h',
|
| + 'browser/ui/toolbar/encoding_menu_controller.cc',
|
| + 'browser/ui/toolbar/encoding_menu_controller.h',
|
| + 'browser/ui/toolbar/toolbar_model.cc',
|
| + 'browser/ui/toolbar/toolbar_model.h',
|
| + 'browser/ui/toolbar/wrench_menu_model.cc',
|
| + 'browser/ui/toolbar/wrench_menu_model.h',
|
| 'browser/ui/views/about_chrome_view.cc',
|
| 'browser/ui/views/about_chrome_view.h',
|
| 'browser/ui/views/about_ipc_dialog.cc',
|
| @@ -3383,6 +3385,11 @@
|
| 'browser/ui/views/window.h',
|
| 'browser/ui/views/wrench_menu.cc',
|
| 'browser/ui/views/wrench_menu.h',
|
| + 'browser/ui/window_sizer.cc',
|
| + 'browser/ui/window_sizer.h',
|
| + 'browser/ui/window_sizer_mac.mm',
|
| + 'browser/ui/window_sizer_linux.cc',
|
| + 'browser/ui/window_sizer_win.cc',
|
| 'browser/upgrade_detector.cc',
|
| 'browser/upgrade_detector.h',
|
| 'browser/user_style_sheet_watcher.cc',
|
| @@ -3408,11 +3415,6 @@
|
| 'browser/web_applications/web_app.h',
|
| 'browser/web_resource/web_resource_service.h',
|
| 'browser/web_resource/web_resource_service.cc',
|
| - 'browser/window_sizer.cc',
|
| - 'browser/window_sizer.h',
|
| - 'browser/window_sizer_mac.mm',
|
| - 'browser/window_sizer_linux.cc',
|
| - 'browser/window_sizer_win.cc',
|
| 'browser/worker_host/message_port_dispatcher.cc',
|
| 'browser/worker_host/message_port_dispatcher.h',
|
| 'browser/worker_host/worker_document_set.cc',
|
| @@ -3421,8 +3423,6 @@
|
| 'browser/worker_host/worker_process_host.h',
|
| 'browser/worker_host/worker_service.cc',
|
| 'browser/worker_host/worker_service.h',
|
| - 'browser/wrench_menu_model.cc',
|
| - 'browser/wrench_menu_model.h',
|
| 'browser/zygote_host_linux.cc',
|
| 'browser/zygote_main_linux.cc',
|
|
|
| @@ -3601,7 +3601,7 @@
|
| 'browser/bookmarks/bookmark_context_menu.cc',
|
| 'browser/bookmarks/bookmark_drop_info.cc',
|
| 'browser/ui/browser_list_stub.cc',
|
| - 'browser/dock_info.cc',
|
| + 'browser/ui/tabs/dock_info.cc',
|
| 'browser/importer/nss_decryptor_system_nss.cc',
|
| 'browser/importer/nss_decryptor_system_nss.h',
|
| 'browser/jankometer.cc',
|
| @@ -3825,10 +3825,6 @@
|
| '<(INTERMEDIATE_DIR)/chrome',
|
| ],
|
| 'sources/': [
|
| - ['include', '^browser/back_forward_menu_model_views.cc'],
|
| - ['include', '^browser/back_forward_menu_model_views.h'],
|
| - ['include', '^browser/dock_info.cc'],
|
| - ['include', '^browser/dock_info.h'],
|
| ['include', '^browser/extensions/'],
|
| # This exclude duplicates the one just above because of the
|
| # order of evaluation of the 'sources/' rule above, the
|
| @@ -3837,6 +3833,8 @@
|
| ['include', 'browser/printing/print_dialog_cloud.cc'],
|
| ['include', 'browser/printing/print_dialog_cloud.h'],
|
| ['include', '^browser/speech/speech_input_bubble_views.cc'],
|
| + ['include', '^browser/ui/tabs/dock_info.cc'],
|
| + ['include', '^browser/ui/tabs/dock_info.h'],
|
| ['include', '^browser/ui/views/about_chrome_view.cc'],
|
| ['include', '^browser/ui/views/about_chrome_view.h'],
|
| ['include', '^browser/ui/views/accelerator_table_gtk.cc'],
|
| @@ -4055,8 +4053,8 @@
|
| ['include', '^browser/ui/views/window.h'],
|
| ['include', '^browser/ui/views/wrench_menu.cc'],
|
| ['include', '^browser/ui/views/wrench_menu.h'],
|
| - ['include', '^browser/window_sizer.cc'],
|
| - ['include', '^browser/window_sizer.h'],
|
| + ['include', '^browser/ui/window_sizer.cc'],
|
| + ['include', '^browser/ui/window_sizer.h'],
|
| # Exclude all of browser/gtk, then include the things we want.
|
| ['exclude', '^browser/gtk'],
|
| ['include', '^browser/gtk/accessibility_event_router_gtk.cc'],
|
|
|