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

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

Issue 1235173002: Revert of Chrome user menu shouldn't close if a tab steals focus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 const content::NativeWebKeyboardEvent& event) override; 146 const content::NativeWebKeyboardEvent& event) override;
147 void CutCopyPaste(int command_id) override; 147 void CutCopyPaste(int command_id) override;
148 WindowOpenDisposition GetDispositionForPopupBounds( 148 WindowOpenDisposition GetDispositionForPopupBounds(
149 const gfx::Rect& bounds) override; 149 const gfx::Rect& bounds) override;
150 FindBar* CreateFindBar() override; 150 FindBar* CreateFindBar() override;
151 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 151 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
152 override; 152 override;
153 void ShowAvatarBubbleFromAvatarButton( 153 void ShowAvatarBubbleFromAvatarButton(
154 AvatarBubbleMode mode, 154 AvatarBubbleMode mode,
155 const signin::ManageAccountsParams& manage_accounts_params) override; 155 const signin::ManageAccountsParams& manage_accounts_params) override;
156 void CloseAvatarBubbleFromAvatarButton() override;
157 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 156 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
158 void ExecuteExtensionCommand(const extensions::Extension* extension, 157 void ExecuteExtensionCommand(const extensions::Extension* extension,
159 const extensions::Command& command) override; 158 const extensions::Command& command) override;
160 ExclusiveAccessContext* GetExclusiveAccessContext() override; 159 ExclusiveAccessContext* GetExclusiveAccessContext() override;
161 160
162 // ExclusiveAccessContext interface 161 // ExclusiveAccessContext interface
163 Profile* GetProfile() override; 162 Profile* GetProfile() override;
164 content::WebContents* GetActiveWebContents() override; 163 content::WebContents* GetActiveWebContents() override;
165 void UnhideDownloadShelf() override; 164 void UnhideDownloadShelf() override;
166 void HideDownloadShelf() override; 165 void HideDownloadShelf() override;
(...skipping 19 matching lines...) Expand all
186 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 185 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
187 186
188 Browser* browser_; // weak, owned by controller 187 Browser* browser_; // weak, owned by controller
189 BrowserWindowController* controller_; // weak, owns us 188 BrowserWindowController* controller_; // weak, owns us
190 base::scoped_nsobject<NSString> pending_window_title_; 189 base::scoped_nsobject<NSString> pending_window_title_;
191 ui::WindowShowState initial_show_state_; 190 ui::WindowShowState initial_show_state_;
192 NSInteger attention_request_id_; // identifier from requestUserAttention 191 NSInteger attention_request_id_; // identifier from requestUserAttention
193 }; 192 };
194 193
195 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 194 #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