OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
7 | 7 |
8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
11 #include "chrome/browser/extensions/api/commands/command_service.h" | |
11 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 12 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
12 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
13 #include "chrome/browser/ui/search/search_model_observer.h" | 14 #include "chrome/browser/ui/search/search_model_observer.h" |
14 #include "ui/base/ui_base_types.h" | 15 #include "ui/base/ui_base_types.h" |
15 | 16 |
16 class Browser; | 17 class Browser; |
17 @class BrowserWindowController; | 18 @class BrowserWindowController; |
18 @class FindBarCocoaController; | 19 @class FindBarCocoaController; |
19 @class NSEvent; | 20 @class NSEvent; |
20 @class NSMenu; | 21 @class NSMenu; |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
169 // Adds the given FindBar cocoa controller to this browser window. | 170 // Adds the given FindBar cocoa controller to this browser window. |
170 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); | 171 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); |
171 | 172 |
172 // Returns the cocoa-world BrowserWindowController | 173 // Returns the cocoa-world BrowserWindowController |
173 BrowserWindowController* cocoa_controller() { return controller_; } | 174 BrowserWindowController* cocoa_controller() { return controller_; } |
174 | 175 |
175 protected: | 176 protected: |
176 virtual void DestroyBrowser() OVERRIDE; | 177 virtual void DestroyBrowser() OVERRIDE; |
177 | 178 |
178 private: | 179 private: |
180 // Triggers the page or browser action for the extension. | |
181 // This function does not support named actions. | |
182 void ShowExtensionActionPopup( | |
183 extensions::CommandService::ExtensionCommandType type, | |
184 std::string extension_id); | |
Robert Sesek
2014/02/26 18:05:13
const&
erikchen
2014/02/26 19:58:23
ack. good catch.
the method got removed once I sto
| |
185 | |
179 NSWindow* window() const; // Accessor for the (current) |NSWindow|. | 186 NSWindow* window() const; // Accessor for the (current) |NSWindow|. |
180 | 187 |
181 Browser* browser_; // weak, owned by controller | 188 Browser* browser_; // weak, owned by controller |
182 BrowserWindowController* controller_; // weak, owns us | 189 BrowserWindowController* controller_; // weak, owns us |
183 base::scoped_nsobject<NSString> pending_window_title_; | 190 base::scoped_nsobject<NSString> pending_window_title_; |
184 ui::WindowShowState initial_show_state_; | 191 ui::WindowShowState initial_show_state_; |
185 NSInteger attention_request_id_; // identifier from requestUserAttention | 192 NSInteger attention_request_id_; // identifier from requestUserAttention |
186 }; | 193 }; |
187 | 194 |
188 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ | 195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ |
OLD | NEW |