Re-factor location bar/toolbar code to get rid of the browser dependency.

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',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2306 matching lines @@
         'browser/ui/browser_init.cc',
         'browser/ui/browser_init.h',
         'browser/ui/browser_list.cc',
         'browser/ui/browser_list.h',
         'browser/ui/browser_list_gtk.cc',
         'browser/ui/browser_list_mac.mm',
         'browser/ui/browser_list_stub.cc',
         'browser/ui/browser_list_win.cc',
         'browser/ui/browser_navigator.cc',
         'browser/ui/browser_navigator.h',
+        'browser/ui/browser_content_setting_bubble_model_delegate.cc',
+        'browser/ui/browser_content_setting_bubble_model_delegate.h',
+        'browser/ui/browser_toolbar_model_delegate.cc',
+        'browser/ui/browser_toolbar_model_delegate.h',
         'browser/ui/browser_tab_restore_service_delegate.cc',
         'browser/ui/browser_tab_restore_service_delegate.h',
         'browser/ui/browser_window.h',
         'browser/ui/certificate_dialogs.cc',
         'browser/ui/certificate_dialogs.h',
         'browser/ui/cocoa/about_ipc_controller.h',
         'browser/ui/cocoa/about_ipc_controller.mm',
         'browser/ui/cocoa/about_ipc_dialog.h',
         'browser/ui/cocoa/about_ipc_dialog.mm',
         'browser/ui/cocoa/about_window_controller.h',
@@ skipping 433 matching lines @@
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h',
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
         'browser/ui/collected_cookies_infobar_delegate.cc',
         'browser/ui/collected_cookies_infobar_delegate.h',
         'browser/ui/confirm_bubble_model.cc',
         'browser/ui/confirm_bubble_model.h',
         'browser/ui/content_settings/content_setting_bubble_model.cc',
         'browser/ui/content_settings/content_setting_bubble_model.h',
+        'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
         'browser/ui/content_settings/content_setting_image_model.cc',
         'browser/ui/content_settings/content_setting_image_model.h',
         'browser/ui/constrained_window.cc',
         'browser/ui/constrained_window.h',
         'browser/ui/constrained_window_tab_helper.cc',
         'browser/ui/constrained_window_tab_helper.h',
         'browser/ui/constrained_window_tab_helper_delegate.cc',
         'browser/ui/constrained_window_tab_helper_delegate.h',
         'browser/ui/crypto_module_password_dialog.cc',
         'browser/ui/crypto_module_password_dialog.h',
@@ skipping 390 matching lines @@
         'browser/ui/tabs/tab_resources.cc',
         'browser/ui/tabs/tab_resources.h',
         'browser/ui/toolbar/back_forward_menu_model.cc',
         'browser/ui/toolbar/back_forward_menu_model.h',
         'browser/ui/toolbar/bookmark_sub_menu_model.cc',
         'browser/ui/toolbar/bookmark_sub_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/toolbar_model_delegate.h',
         'browser/ui/toolbar/wrench_menu_model.cc',
         'browser/ui/toolbar/wrench_menu_model.h',
         'browser/ui/toolbar/wrench_menu_model_chromeos.cc',
         'browser/ui/touch/status_bubble_touch.cc',
         'browser/ui/touch/status_bubble_touch.h',
         'browser/ui/view_ids.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',
@@ skipping 2182 matching lines @@
          'variables': {
           'proto_in_dir': '../third_party/cros_system_api/dbus/',
           'proto_out_dir': 'chrome/browser/chromeos/dbus',
          },
          'includes': ['../build/protoc.gypi'],
         }],
       ],
     },
   ],
 }