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

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 10446106: Preliminary metro snap plumbing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix test errors, unify fullscreen code in browser view. Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 72ce6850f4674ee4ff48b145021051c40f29304e..d13ceddc632cb9d821068f4652058f3ec4574ff6 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -254,6 +254,9 @@ class BrowserView : public BrowserWindow,
const GURL& url,
FullscreenExitBubbleType bubble_type) OVERRIDE;
virtual bool IsFullscreen() const OVERRIDE;
+#if defined(OS_WIN)
+ virtual void ToggleMetroSnapMode(bool enable) OVERRIDE;
+#endif
virtual LocationBar* GetLocationBar() const OVERRIDE;
virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
@@ -439,6 +442,11 @@ class BrowserView : public BrowserWindow,
FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest,
TestAboutChromeViewAccObj);
+ enum ProcessFullscreenType {
sky 2012/06/11 17:04:31 How about just FullscreenType
robertshield 2012/06/11 21:06:57 Done.
+ FOR_DESKTOP,
+ FOR_METRO
+ };
+
// We store this on linux because we must call ProcessFullscreen()
// asynchronously from FullScreenStateChanged() instead of directly from
// EnterFullscreen().
@@ -502,6 +510,7 @@ class BrowserView : public BrowserWindow,
// |bubble_type| determines what should be shown in the fullscreen exit
// bubble.
void ProcessFullscreen(bool fullscreen,
+ ProcessFullscreenType fullscreen_type,
const GURL& url,
FullscreenExitBubbleType bubble_type);

Powered by Google App Engine
This is Rietveld 408576698