Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 489183005: Make a ShowExtensionActionPopup function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Peter's Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, 154 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
155 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE; 155 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE;
156 virtual void ShowPasswordGenerationBubble( 156 virtual void ShowPasswordGenerationBubble(
157 const gfx::Rect& rect, 157 const gfx::Rect& rect,
158 const autofill::PasswordForm& form, 158 const autofill::PasswordForm& form,
159 autofill::PasswordGenerator* password_generator) OVERRIDE; 159 autofill::PasswordGenerator* password_generator) OVERRIDE;
160 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; 160 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE;
161 virtual void ExecuteExtensionCommand( 161 virtual void ExecuteExtensionCommand(
162 const extensions::Extension* extension, 162 const extensions::Extension* extension,
163 const extensions::Command& command) OVERRIDE; 163 const extensions::Command& command) OVERRIDE;
164 virtual void ShowPageActionPopup(
165 const extensions::Extension* extension) OVERRIDE;
166 virtual void ShowBrowserActionPopup(
167 const extensions::Extension* extension) OVERRIDE;
168 164
169 // Overridden from ExtensionKeybindingRegistry::Delegate: 165 // Overridden from ExtensionKeybindingRegistry::Delegate:
170 virtual extensions::ActiveTabPermissionGranter* 166 virtual extensions::ActiveTabPermissionGranter*
171 GetActiveTabPermissionGranter() OVERRIDE; 167 GetActiveTabPermissionGranter() OVERRIDE;
172 168
173 // Overridden from SearchModelObserver: 169 // Overridden from SearchModelObserver:
174 virtual void ModelChanged(const SearchModel::State& old_state, 170 virtual void ModelChanged(const SearchModel::State& old_state,
175 const SearchModel::State& new_state) OVERRIDE; 171 const SearchModel::State& new_state) OVERRIDE;
176 172
177 // Adds the given FindBar cocoa controller to this browser window. 173 // Adds the given FindBar cocoa controller to this browser window.
178 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 174 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
179 175
180 // Returns the cocoa-world BrowserWindowController 176 // Returns the cocoa-world BrowserWindowController
181 BrowserWindowController* cocoa_controller() { return controller_; } 177 BrowserWindowController* cocoa_controller() { return controller_; }
182 178
183 protected: 179 protected:
184 virtual void DestroyBrowser() OVERRIDE; 180 virtual void DestroyBrowser() OVERRIDE;
185 181
186 private: 182 private:
187 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 183 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
188 184
189 Browser* browser_; // weak, owned by controller 185 Browser* browser_; // weak, owned by controller
190 BrowserWindowController* controller_; // weak, owns us 186 BrowserWindowController* controller_; // weak, owns us
191 base::scoped_nsobject<NSString> pending_window_title_; 187 base::scoped_nsobject<NSString> pending_window_title_;
192 ui::WindowShowState initial_show_state_; 188 ui::WindowShowState initial_show_state_;
193 NSInteger attention_request_id_; // identifier from requestUserAttention 189 NSInteger attention_request_id_; // identifier from requestUserAttention
194 }; 190 };
195 191
196 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 192 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698