Flatten down to a single toolbar per window, significantly simplifying the ta...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 505 matching lines @@
         'browser/cocoa/bookmark_bar_state_controller.mm',
         'browser/cocoa/bookmark_menu_bridge.h',
         'browser/cocoa/bookmark_menu_bridge.mm',
         'browser/cocoa/bookmark_menu_cocoa_controller.h',
         'browser/cocoa/bookmark_menu_cocoa_controller.mm',
         'browser/cocoa/browser_test_helper.h',
         'browser/cocoa/browser_window_cocoa.h',
         'browser/cocoa/browser_window_cocoa.mm',
         'browser/cocoa/browser_window_controller.h',
         'browser/cocoa/browser_window_controller.mm',
+        'browser/cocoa/command_observer_bridge.h',
+        'browser/cocoa/command_observer_bridge.mm',
         'browser/cocoa/grow_box_view.h',
         'browser/cocoa/grow_box_view.m',
         'browser/cocoa/location_bar_view_mac.h',
         'browser/cocoa/location_bar_view_mac.mm',
         'browser/cocoa/sad_tab_view.h',
         'browser/cocoa/sad_tab_view.mm',
         'browser/cocoa/shell_dialogs_mac.mm',
         'browser/cocoa/status_bubble_mac.h',
         'browser/cocoa/status_bubble_mac.mm',
         'browser/cocoa/tab_cell.h',
         'browser/cocoa/tab_cell.mm',
         'browser/cocoa/tab_contents_controller.h',
         'browser/cocoa/tab_contents_controller.mm',
         'browser/cocoa/tab_controller.h',
         'browser/cocoa/tab_controller.mm',
         'browser/cocoa/tab_strip_controller.h',
         'browser/cocoa/tab_strip_controller.mm',
         'browser/cocoa/tab_strip_model_observer_bridge.h',
         'browser/cocoa/tab_strip_model_observer_bridge.mm',
         'browser/cocoa/tab_strip_view.h',
         'browser/cocoa/tab_strip_view.mm',
         'browser/cocoa/tab_view.h',
         'browser/cocoa/tab_view.mm',
         'browser/cocoa/tab_window_controller.h',
         'browser/cocoa/tab_window_controller.mm',
         'browser/cocoa/toolbar_button_cell.h',
         'browser/cocoa/toolbar_button_cell.mm',
+        'browser/cocoa/toolbar_controller.h',
+        'browser/cocoa/toolbar_controller.mm',
         'browser/cocoa/toolbar_view.h',
         'browser/cocoa/toolbar_view.mm',
         'browser/command_updater.cc',
         'browser/command_updater.h',
         'browser/cross_site_request_manager.cc',
         'browser/cross_site_request_manager.h',
         'browser/debugger/debugger_host.h',
         'browser/debugger/debugger_host_impl.cpp',
         'browser/debugger/debugger_host_impl.h',
         'browser/debugger/debugger_io.h',
@@ skipping 976 matching lines @@
         'app/google_update_client.h',
         'app/keystone_glue.h',
         'app/keystone_glue.m',
         'app/scoped_ole_initializer.h',
       ],
       'mac_bundle_resources': [
         'app/nibs/en.lproj/BrowserWindow.xib',
         'app/nibs/en.lproj/MainMenu.xib',
         'app/nibs/en.lproj/TabContents.xib',
         'app/nibs/en.lproj/TabView.xib',
+        'app/nibs/en.lproj/Toolbar.xib',
         'app/theme/back.pdf',
         'app/theme/forward.pdf',
         'app/theme/go.pdf',
         'app/theme/grow_box.png',
         'app/theme/nav.pdf',
         'app/theme/newtab.pdf',
         'app/theme/reload.pdf',
         'app/theme/sadtab.png',
         'app/theme/star.pdf',
         'app/theme/starred.pdf',
@@ skipping 1290 matching lines @@
                           '../tools/code_coverage/coverage_posix.py',
                           '--directory',
                           '<(PRODUCT_DIR)' ],
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }