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

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

Issue 652983005: mac: Fix bug where exiting tab fullscreen would cause Chrome menubar to disappear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test. Created 6 years, 2 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 virtual void ShowAppMenu() override; 135 virtual void ShowAppMenu() override;
136 virtual bool PreHandleKeyboardEvent( 136 virtual bool PreHandleKeyboardEvent(
137 const content::NativeWebKeyboardEvent& event, 137 const content::NativeWebKeyboardEvent& event,
138 bool* is_keyboard_shortcut) override; 138 bool* is_keyboard_shortcut) override;
139 virtual void HandleKeyboardEvent( 139 virtual void HandleKeyboardEvent(
140 const content::NativeWebKeyboardEvent& event) override; 140 const content::NativeWebKeyboardEvent& event) override;
141 virtual void Cut() override; 141 virtual void Cut() override;
142 virtual void Copy() override; 142 virtual void Copy() override;
143 virtual void Paste() override; 143 virtual void Paste() override;
144 virtual void EnterFullscreenWithChrome() override; 144 virtual void EnterFullscreenWithChrome() override;
145 virtual void EnterFullscreenWithoutChrome() override;
145 virtual bool IsFullscreenWithChrome() override; 146 virtual bool IsFullscreenWithChrome() override;
146 virtual bool IsFullscreenWithoutChrome() override; 147 virtual bool IsFullscreenWithoutChrome() override;
147 virtual WindowOpenDisposition GetDispositionForPopupBounds( 148 virtual WindowOpenDisposition GetDispositionForPopupBounds(
148 const gfx::Rect& bounds) override; 149 const gfx::Rect& bounds) override;
149 virtual FindBar* CreateFindBar() override; 150 virtual FindBar* CreateFindBar() override;
150 virtual web_modal::WebContentsModalDialogHost* 151 virtual web_modal::WebContentsModalDialogHost*
151 GetWebContentsModalDialogHost() override; 152 GetWebContentsModalDialogHost() override;
152 virtual void ShowAvatarBubble(content::WebContents* web_contents, 153 virtual void ShowAvatarBubble(content::WebContents* web_contents,
153 const gfx::Rect& rect) override; 154 const gfx::Rect& rect) override;
154 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, 155 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
(...skipping 24 matching lines...) Expand all
179 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 180 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
180 181
181 Browser* browser_; // weak, owned by controller 182 Browser* browser_; // weak, owned by controller
182 BrowserWindowController* controller_; // weak, owns us 183 BrowserWindowController* controller_; // weak, owns us
183 base::scoped_nsobject<NSString> pending_window_title_; 184 base::scoped_nsobject<NSString> pending_window_title_;
184 ui::WindowShowState initial_show_state_; 185 ui::WindowShowState initial_show_state_;
185 NSInteger attention_request_id_; // identifier from requestUserAttention 186 NSInteger attention_request_id_; // identifier from requestUserAttention
186 }; 187 };
187 188
188 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 189 #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