Move a bunch more browser stuff around....

chrome/chrome_browser.gypi

 # Copyright (c) 2010 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': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 242 matching lines @@
         'browser/automation/testing_automation_provider_win.cc',
         'browser/automation/testing_automation_provider.cc',
         'browser/automation/testing_automation_provider.h',
         'browser/automation/url_request_automation_job.cc',
         'browser/automation/url_request_automation_job.h',
         'browser/automation/ui_controls_internal.h',
         'browser/automation/ui_controls_linux.cc',
         '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',
         'browser/background_contents_service.h',
         'browser/background_mode_manager.cc',
         'browser/background_mode_manager.h',
         'browser/background_page_tracker.cc',
         'browser/background_page_tracker.h',
         'browser/blocked_content_container.cc',
         'browser/blocked_content_container.h',
@@ skipping 536 matching lines @@
         'browser/device_orientation/provider_impl.h',
         'browser/diagnostics/diagnostics_main.cc',
         'browser/diagnostics/diagnostics_main.h',
         'browser/diagnostics/diagnostics_model.h',
         'browser/diagnostics/diagnostics_model.cc',
         'browser/diagnostics/diagnostics_test.h',
         'browser/diagnostics/sqlite_diagnostics.cc',
         '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',
         'browser/dom_ui/bookmarks_ui.cc',
         'browser/dom_ui/bookmarks_ui.h',
         'browser/dom_ui/bug_report_ui.cc',
         'browser/dom_ui/bug_report_ui.h',
         'browser/dom_ui/chrome_url_data_manager.cc',
         'browser/dom_ui/chrome_url_data_manager.h',
         'browser/dom_ui/constrained_html_ui.cc',
@@ skipping 154 matching lines @@
         'browser/download/save_file.cc',
         'browser/download/save_file.h',
         'browser/download/save_file_manager.cc',
         'browser/download/save_file_manager.h',
         'browser/download/save_item.cc',
         'browser/download/save_item.h',
         'browser/download/save_package.cc',
         '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',
         'browser/extensions/convert_web_app.h',
         'browser/extensions/crashed_extension_infobar.cc',
         'browser/extensions/crashed_extension_infobar.h',
         'browser/extensions/crx_installer.cc',
         'browser/extensions/crx_installer.h',
         'browser/extensions/default_apps.cc',
         'browser/extensions/default_apps.h',
@@ skipping 1508 matching lines @@
         'browser/task_manager/task_manager.cc',
         'browser/task_manager/task_manager.h',
         'browser/task_manager/task_manager_resource_providers.cc',
         'browser/task_manager/task_manager_resource_providers.h',
         'browser/themes/browser_theme_pack.cc',
         'browser/themes/browser_theme_pack.h',
         'browser/themes/browser_theme_provider_gtk.cc',
         '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',
         'browser/translate/options_menu_model.h',
         'browser/translate/translate_infobar_view.h',
         'browser/translate/translate_infobar_delegate.cc',
         'browser/translate/translate_infobar_delegate.h',
         'browser/translate/translate_manager.cc',
         'browser/translate/translate_manager.h',
         'browser/translate/translate_prefs.cc',
@@ skipping 473 matching lines @@
         'browser/ui/cocoa/wrench_menu_button_cell.h',
         'browser/ui/cocoa/wrench_menu_button_cell.mm',
         'browser/ui/cocoa/wrench_menu_controller.h',
         'browser/ui/cocoa/wrench_menu_controller.mm',        
         'browser/ui/find_bar/find_bar.h',
         'browser/ui/find_bar/find_bar_controller.cc',
         'browser/ui/find_bar/find_bar_controller.h',
         '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',
         'browser/ui/views/about_ipc_dialog.h',
         'browser/ui/views/accelerator_table_gtk.cc',
         'browser/ui/views/accelerator_table_gtk.h',
         'browser/ui/views/accessibility_event_router_views.cc',
         'browser/ui/views/accessibility_event_router_views.h',
         'browser/ui/views/accessible_pane_view.cc',
         'browser/ui/views/accessible_pane_view.h',
@@ skipping 341 matching lines @@
         'browser/ui/views/unhandled_keyboard_event_handler.cc',
         'browser/ui/views/unhandled_keyboard_event_handler.h',
         'browser/ui/views/update_recommended_message_box.cc',
         'browser/ui/views/update_recommended_message_box.h',
         'browser/ui/views/user_data_dir_dialog.cc',
         'browser/ui/views/user_data_dir_dialog.h',
         'browser/ui/views/window.cc',
         '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',
         'browser/user_style_sheet_watcher.h',
         'browser/utility_process_host.cc',
         'browser/utility_process_host.h',
         'browser/view_ids.h',
         'browser/visitedlink_master.cc',
         'browser/visitedlink_master.h',
         'browser/visitedlink_event_listener.cc',
         'browser/visitedlink_event_listener.h',
         'browser/webdata/autofill_change.cc',
         'browser/webdata/autofill_change.h',
         'browser/webdata/autofill_entry.cc',
         'browser/webdata/autofill_entry.h',
         'browser/webdata/web_data_service.cc',
         'browser/webdata/web_data_service.h',
         'browser/webdata/web_data_service_win.cc',
         'browser/webdata/web_database.cc',
         'browser/webdata/web_database.h',
         'browser/webdata/web_database_win.cc',
         'browser/web_applications/web_app.cc',
         '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',
         'browser/worker_host/worker_document_set.h',
         'browser/worker_host/worker_process_host.cc',
         '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',
 
         # These files are generated by GRIT.
         '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc',
         '<(grit_out_dir)/grit/shared_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
@@ skipping 158 matching lines @@
           'sources!': [
             'browser/net/ssl_config_service_manager_system.cc',
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             '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',
             'browser/password_manager/login_database_posix.cc',
             'browser/power_save_blocker_stub.cc',
             'browser/renderer_host/backing_store_proxy.cc',
             'browser/renderer_host/backing_store_proxy.h',
             'browser/renderer_host/gpu_view_host.cc',
             'browser/renderer_host/gpu_view_host.h',
             'browser/renderer_host/video_layer_proxy.cc',
@@ skipping 203 matching lines @@
           'conditions': [
             ['OS=="linux" and toolkit_views==1',{
               'dependencies': [
                 '../views/views.gyp:views',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(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
                 # conditions, and this 'sources/' rule.
                 ['exclude', '^browser/extensions/extension_rlz_module'],
                 ['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'],
                 ['include', '^browser/ui/views/accelerator_table_gtk.h'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.cc'],
                 ['include', '^browser/ui/views/accessibility_event_router_views.h'],
                 ['include', '^browser/ui/views/accessible_pane_view.cc'],
                 ['include', '^browser/ui/views/accessible_pane_view.h'],
                 ['include', '^browser/ui/views/accessible_view_helper.cc'],
                 ['include', '^browser/ui/views/accessible_view_helper.h'],
@@ skipping 198 matching lines @@
                 ['include', '^browser/ui/views/unhandled_keyboard_event_handler.cc'],
                 ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'],
                 ['include', '^browser/ui/views/update_recommended_message_box.h'],
                 ['include', '^browser/ui/views/update_recommended_message_box.cc'],
                 ['include', '^browser/ui/views/view_text_utils.cc'],
                 ['include', '^browser/ui/views/view_text_utils.h'],
                 ['include', '^browser/ui/views/window.cc'],
                 ['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'],
                 ['include', '^browser/gtk/accessibility_event_router_gtk.h'],
                 ['include', '^browser/gtk/accessible_widget_helper_gtk.cc'],
                 ['include', '^browser/gtk/accessible_widget_helper_gtk.h'],
                 ['include', '^browser/gtk/bookmark_editor_gtk.cc'],
                 ['include', '^browser/gtk/bookmark_editor_gtk.h'],
                 ['include', '^browser/gtk/bookmark_tree_model.cc'],
                 ['include', '^browser/gtk/bookmark_tree_model.h'],
@@ skipping 307 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: