| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| 11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
| 12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 13 #include "chrome/browser/download/download_shelf.h" | 13 #include "chrome/browser/download/download_shelf.h" |
| 14 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 14 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
| 15 #include "chrome/browser/page_info_window.h" | 15 #include "chrome/browser/page_info_window.h" |
| 16 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/sidebar/sidebar_container.h" | 18 #include "chrome/browser/sidebar/sidebar_container.h" |
| 19 #include "chrome/browser/sidebar/sidebar_manager.h" | 19 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 20 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
| 21 #include "chrome/browser/ui/browser_list.h" | 21 #include "chrome/browser/ui/browser_list.h" |
| 22 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 22 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
| 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 24 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" | |
| 25 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 24 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 26 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" | 25 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" |
| 27 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 26 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 27 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 29 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" | 28 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" |
| 30 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 31 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 30 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
| 32 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" | 31 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" |
| 33 #include "chrome/browser/ui/cocoa/restart_browser.h" | 32 #include "chrome/browser/ui/cocoa/restart_browser.h" |
| 34 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 33 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 | 680 |
| 682 NSWindow* BrowserWindowCocoa::window() const { | 681 NSWindow* BrowserWindowCocoa::window() const { |
| 683 return [controller_ window]; | 682 return [controller_ window]; |
| 684 } | 683 } |
| 685 | 684 |
| 686 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { | 685 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { |
| 687 if (tab_contents == browser_->GetSelectedTabContents()) { | 686 if (tab_contents == browser_->GetSelectedTabContents()) { |
| 688 [controller_ updateSidebarForContents:tab_contents]; | 687 [controller_ updateSidebarForContents:tab_contents]; |
| 689 } | 688 } |
| 690 } | 689 } |
| OLD | NEW |