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

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

Issue 12018007: Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge TOT Created 7 years, 10 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 | Annotate | Revision Log
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/memory/scoped_nsobject.h" 8 #include "base/memory/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"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 bool* is_keyboard_shortcut) OVERRIDE; 120 bool* is_keyboard_shortcut) OVERRIDE;
121 virtual void HandleKeyboardEvent( 121 virtual void HandleKeyboardEvent(
122 const content::NativeWebKeyboardEvent& event) OVERRIDE; 122 const content::NativeWebKeyboardEvent& event) OVERRIDE;
123 virtual void ShowCreateChromeAppShortcutsDialog( 123 virtual void ShowCreateChromeAppShortcutsDialog(
124 Profile* profile, 124 Profile* profile,
125 const extensions::Extension* app) OVERRIDE; 125 const extensions::Extension* app) OVERRIDE;
126 virtual void Cut() OVERRIDE; 126 virtual void Cut() OVERRIDE;
127 virtual void Copy() OVERRIDE; 127 virtual void Copy() OVERRIDE;
128 virtual void Paste() OVERRIDE; 128 virtual void Paste() OVERRIDE;
129 virtual void OpenTabpose() OVERRIDE; 129 virtual void OpenTabpose() OVERRIDE;
130 virtual void EnterPresentationMode( 130 virtual void EnterFullscreenWithChrome() OVERRIDE;
131 const GURL& url, 131 virtual bool IsFullscreenWithChrome() OVERRIDE;
132 FullscreenExitBubbleType bubble_type) OVERRIDE; 132 virtual bool IsFullscreenWithoutChrome() OVERRIDE;
133 virtual void ExitPresentationMode() OVERRIDE;
134 virtual bool InPresentationMode() OVERRIDE;
135 virtual gfx::Rect GetInstantBounds() OVERRIDE; 133 virtual gfx::Rect GetInstantBounds() OVERRIDE;
136 virtual WindowOpenDisposition GetDispositionForPopupBounds( 134 virtual WindowOpenDisposition GetDispositionForPopupBounds(
137 const gfx::Rect& bounds) OVERRIDE; 135 const gfx::Rect& bounds) OVERRIDE;
138 virtual FindBar* CreateFindBar() OVERRIDE; 136 virtual FindBar* CreateFindBar() OVERRIDE;
139 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE; 137 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE;
140 virtual void ShowAvatarBubble(content::WebContents* web_contents, 138 virtual void ShowAvatarBubble(content::WebContents* web_contents,
141 const gfx::Rect& rect) OVERRIDE; 139 const gfx::Rect& rect) OVERRIDE;
142 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 140 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
143 virtual void ShowPasswordGenerationBubble( 141 virtual void ShowPasswordGenerationBubble(
144 const gfx::Rect& rect, 142 const gfx::Rect& rect,
(...skipping 22 matching lines...) Expand all
167 165
168 Browser* browser_; // weak, owned by controller 166 Browser* browser_; // weak, owned by controller
169 BrowserWindowController* controller_; // weak, owns us 167 BrowserWindowController* controller_; // weak, owns us
170 base::WeakPtrFactory<Browser> confirm_close_factory_; 168 base::WeakPtrFactory<Browser> confirm_close_factory_;
171 scoped_nsobject<NSString> pending_window_title_; 169 scoped_nsobject<NSString> pending_window_title_;
172 ui::WindowShowState initial_show_state_; 170 ui::WindowShowState initial_show_state_;
173 NSInteger attention_request_id_; // identifier from requestUserAttention 171 NSInteger attention_request_id_; // identifier from requestUserAttention
174 }; 172 };
175 173
176 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/applescript/window_applescript.mm ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698