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

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

Issue 48963002: [Refactor] Move the non-browser specific logic of ImmersiveModeControllerAsh into ash part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « ash/wm/immersive_revealed_lock.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 39fdf085f4865c9220fee2e0c218747d20a4610c..a2241faa99eccb41998ad8d292e6320bc222ab50 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -92,7 +92,6 @@ class BrowserView : public BrowserWindow,
public views::WidgetDelegate,
public views::WidgetObserver,
public views::ClientView,
- public ImmersiveModeController::Delegate,
public InfoBarContainer::Delegate,
public views::SingleSplitViewListener,
public gfx::SysColorChangeListener,
@@ -252,6 +251,11 @@ class BrowserView : public BrowserWindow,
return window_switcher_button_;
}
+ // Called after the widget's fullscreen state is changed without going through
+ // FullscreenController. This method does any processing which was skipped.
+ // Only exiting fullscreen in this way is currently supported.
+ void FullscreenStateChanged();
+
// Called from BookmarkBarView/DownloadShelfView during their show/hide
// animations.
void ToolbarSizeChanged(bool is_animating);
@@ -427,12 +431,6 @@ class BrowserView : public BrowserWindow,
virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
virtual gfx::Size GetMinimumSize() OVERRIDE;
- // ImmersiveModeController::Delegate overrides:
- virtual FullscreenController* GetFullscreenController() OVERRIDE;
- virtual void FullscreenStateChanged() OVERRIDE;
- virtual void SetImmersiveStyle(bool immersive) OVERRIDE;
- virtual content::WebContents* GetWebContents() OVERRIDE;
-
// InfoBarContainer::Delegate overrides
virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
« no previous file with comments | « ash/wm/immersive_revealed_lock.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698