OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ | 5 #ifndef CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ | 6 #define CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
7 | 7 |
8 #include "chrome/browser/browser_window.h" | 8 #include "chrome/browser/browser_window.h" |
9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
10 #include "chrome/common/notification_registrar.h" | 10 #include "chrome/common/notification_registrar.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 gfx::NativeWindow parent_window); | 81 gfx::NativeWindow parent_window); |
82 virtual void UserChangedTheme(); | 82 virtual void UserChangedTheme(); |
83 virtual int GetExtraRenderViewHeight() const; | 83 virtual int GetExtraRenderViewHeight() const; |
84 virtual void TabContentsFocused(TabContents* tab_contents); | 84 virtual void TabContentsFocused(TabContents* tab_contents); |
85 virtual void ShowPageInfo(Profile* profile, | 85 virtual void ShowPageInfo(Profile* profile, |
86 const GURL& url, | 86 const GURL& url, |
87 const NavigationEntry::SSLStatus& ssl, | 87 const NavigationEntry::SSLStatus& ssl, |
88 bool show_history); | 88 bool show_history); |
89 virtual void ShowPageMenu(); | 89 virtual void ShowPageMenu(); |
90 virtual void ShowAppMenu(); | 90 virtual void ShowAppMenu(); |
| 91 virtual int GetCommandId(const NativeWebKeyboardEvent& event); |
91 | 92 |
92 // Overridden from NotificationObserver | 93 // Overridden from NotificationObserver |
93 virtual void Observe(NotificationType type, | 94 virtual void Observe(NotificationType type, |
94 const NotificationSource& source, | 95 const NotificationSource& source, |
95 const NotificationDetails& details); | 96 const NotificationDetails& details); |
96 | 97 |
97 // Adds the given FindBar cocoa controller to this browser window. | 98 // Adds the given FindBar cocoa controller to this browser window. |
98 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 99 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
99 | 100 |
100 // Returns the cocoa-world BrowserWindowController | 101 // Returns the cocoa-world BrowserWindowController |
101 BrowserWindowController* cocoa_controller() { return controller_; } | 102 BrowserWindowController* cocoa_controller() { return controller_; } |
102 | 103 |
103 protected: | 104 protected: |
104 virtual void DestroyBrowser(); | 105 virtual void DestroyBrowser(); |
105 | 106 |
106 private: | 107 private: |
107 NotificationRegistrar registrar_; | 108 NotificationRegistrar registrar_; |
108 NSWindow* window_; // weak, owned by controller | 109 NSWindow* window_; // weak, owned by controller |
109 Browser* browser_; // weak, owned by controller | 110 Browser* browser_; // weak, owned by controller |
110 BrowserWindowController* controller_; // weak, owns us | 111 BrowserWindowController* controller_; // weak, owns us |
111 }; | 112 }; |
112 | 113 |
113 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ | 114 #endif // CHROME_BROWSER_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |