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

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, 11 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 bool* is_keyboard_shortcut) OVERRIDE; 122 bool* is_keyboard_shortcut) OVERRIDE;
123 virtual void HandleKeyboardEvent( 123 virtual void HandleKeyboardEvent(
124 const content::NativeWebKeyboardEvent& event) OVERRIDE; 124 const content::NativeWebKeyboardEvent& event) OVERRIDE;
125 virtual void ShowCreateChromeAppShortcutsDialog( 125 virtual void ShowCreateChromeAppShortcutsDialog(
126 Profile* profile, 126 Profile* profile,
127 const extensions::Extension* app) OVERRIDE; 127 const extensions::Extension* app) OVERRIDE;
128 virtual void Cut() OVERRIDE; 128 virtual void Cut() OVERRIDE;
129 virtual void Copy() OVERRIDE; 129 virtual void Copy() OVERRIDE;
130 virtual void Paste() OVERRIDE; 130 virtual void Paste() OVERRIDE;
131 virtual void OpenTabpose() OVERRIDE; 131 virtual void OpenTabpose() OVERRIDE;
132 virtual void EnterPresentationMode( 132 virtual void EnterFullscreenWithChrome(
133 const GURL& url, 133 const GURL& url,
134 FullscreenExitBubbleType bubble_type) OVERRIDE; 134 FullscreenExitBubbleType bubble_type) OVERRIDE;
135 virtual void ExitPresentationMode() OVERRIDE; 135 virtual bool IsFullscreenWithChrome() OVERRIDE;
136 virtual bool InPresentationMode() OVERRIDE; 136 virtual bool IsFullscreenWithoutChrome() OVERRIDE;
137 virtual gfx::Rect GetInstantBounds() OVERRIDE; 137 virtual gfx::Rect GetInstantBounds() OVERRIDE;
138 virtual bool IsInstantTabShowing() OVERRIDE; 138 virtual bool IsInstantTabShowing() OVERRIDE;
139 virtual WindowOpenDisposition GetDispositionForPopupBounds( 139 virtual WindowOpenDisposition GetDispositionForPopupBounds(
140 const gfx::Rect& bounds) OVERRIDE; 140 const gfx::Rect& bounds) OVERRIDE;
141 virtual FindBar* CreateFindBar() OVERRIDE; 141 virtual FindBar* CreateFindBar() OVERRIDE;
142 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE; 142 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE;
143 virtual void ShowAvatarBubble(content::WebContents* web_contents, 143 virtual void ShowAvatarBubble(content::WebContents* web_contents,
144 const gfx::Rect& rect) OVERRIDE; 144 const gfx::Rect& rect) OVERRIDE;
145 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 145 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
146 virtual void ShowPasswordGenerationBubble( 146 virtual void ShowPasswordGenerationBubble(
(...skipping 19 matching lines...) Expand all
166 166
167 Browser* browser_; // weak, owned by controller 167 Browser* browser_; // weak, owned by controller
168 BrowserWindowController* controller_; // weak, owns us 168 BrowserWindowController* controller_; // weak, owns us
169 base::WeakPtrFactory<Browser> confirm_close_factory_; 169 base::WeakPtrFactory<Browser> confirm_close_factory_;
170 scoped_nsobject<NSString> pending_window_title_; 170 scoped_nsobject<NSString> pending_window_title_;
171 ui::WindowShowState initial_show_state_; 171 ui::WindowShowState initial_show_state_;
172 NSInteger attention_request_id_; // identifier from requestUserAttention 172 NSInteger attention_request_id_; // identifier from requestUserAttention
173 }; 173 };
174 174
175 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 175 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698