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 "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
34 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h" | 34 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h" |
35 #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h" | 35 #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h" |
36 #import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h" | 36 #import "chrome/browser/ui/cocoa/options/keyword_editor_cocoa_controller.h" |
37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
38 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" | 38 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" |
39 #include "chrome/browser/ui/cocoa/restart_browser.h" | 39 #include "chrome/browser/ui/cocoa/restart_browser.h" |
40 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 40 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
41 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 41 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
42 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" | 42 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" |
43 #import "chrome/browser/ui/cocoa/toolbar_controller.h" | 43 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
45 #include "chrome/common/native_web_keyboard_event.h" | 45 #include "chrome/common/native_web_keyboard_event.h" |
46 #include "chrome/common/notification_service.h" | 46 #include "chrome/common/notification_service.h" |
47 #include "chrome/common/pref_names.h" | 47 #include "chrome/common/pref_names.h" |
48 #include "gfx/rect.h" | 48 #include "gfx/rect.h" |
49 #include "grit/chromium_strings.h" | 49 #include "grit/chromium_strings.h" |
50 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
51 | 51 |
52 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, | 52 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, |
53 BrowserWindowController* controller, | 53 BrowserWindowController* controller, |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
635 | 635 |
636 NSWindow* BrowserWindowCocoa::window() const { | 636 NSWindow* BrowserWindowCocoa::window() const { |
637 return [controller_ window]; | 637 return [controller_ window]; |
638 } | 638 } |
639 | 639 |
640 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { | 640 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { |
641 if (tab_contents == browser_->GetSelectedTabContents()) { | 641 if (tab_contents == browser_->GetSelectedTabContents()) { |
642 [controller_ updateSidebarForContents:tab_contents]; | 642 [controller_ updateSidebarForContents:tab_contents]; |
643 } | 643 } |
644 } | 644 } |
OLD | NEW |