summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/browser_window_cocoa.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 06:11:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 06:11:53 +0000
commit8d944b369dc0979cc9926cdda7673682bf8e5bef (patch)
treecf597f2b4443c04d48b14dfa2fc434984a058c90 /chrome/browser/ui/cocoa/browser_window_cocoa.h
parent700317717262a7a81f38c6850e7b1e678ad5b7b7 (diff)
downloadchromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.zip
chromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.tar.gz
chromium_src-8d944b369dc0979cc9926cdda7673682bf8e5bef.tar.bz2
Change EnterFullscreen() to take an enum instead of a bool as second parameter.
Also, add a UpdateFullscreenExitBubbleContent() method. At both call site and implementor side, just funnel the previous bool through the enum for now. This decouples the implementation of the new UI from the backend support. Based on a patch by Yuzhu Shen <yzshen@chromium.org> BUG=95136 TEST=everything works as before TBR=ben (OWNERS review for this part is at http://codereview.chromium.org/8274022/ ) Review URL: http://codereview.chromium.org/8313012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.h')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 3d3042c..7d2ba5f 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -55,8 +55,12 @@ class BrowserWindowCocoa : public BrowserWindow,
virtual gfx::Rect GetBounds() const;
virtual bool IsMaximized() const;
virtual bool IsMinimized() const;
- virtual void EnterFullscreen(const GURL& url, bool ask_permission);
- virtual void ExitFullscreen();
+ virtual void EnterFullscreen(
+ const GURL& url, FullscreenExitBubbleType type) OVERRIDE;
+ virtual void ExitFullscreen() OVERRIDE;
+ virtual void UpdateFullscreenExitBubbleContent(
+ const GURL& url,
+ FullscreenExitBubbleType bubble_type) OVERRIDE;
virtual bool IsFullscreen() const;
virtual bool IsFullscreenBubbleVisible() const;
virtual LocationBar* GetLocationBar() const;
@@ -106,9 +110,10 @@ class BrowserWindowCocoa : public BrowserWindow,
virtual void Copy();
virtual void Paste();
virtual void OpenTabpose();
- virtual void SetPresentationMode(bool presentation_mode,
- const GURL& url,
- bool ask_permission);
+ virtual void EnterPresentationMode(
+ const GURL& url,
+ FullscreenExitBubbleType bubble_type) OVERRIDE;
+ virtual void ExitPresentationMode() OVERRIDE;
virtual bool InPresentationMode();
virtual void ShowInstant(TabContentsWrapper* preview);
virtual void HideInstant();