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

Unified Diff: ash/common/frame/custom_frame_view_ash.h

Issue 2277563002: Wires up immersive mode for chrome and mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 4 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
« no previous file with comments | « no previous file | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/custom_frame_view_ash.h
diff --git a/ash/common/frame/custom_frame_view_ash.h b/ash/common/frame/custom_frame_view_ash.h
index 9409ba6fc46929bb4e85c21432aa10ce687dedbf..b2e50bedffb1845f9b4109c5762acb19816ec546 100644
--- a/ash/common/frame/custom_frame_view_ash.h
+++ b/ash/common/frame/custom_frame_view_ash.h
@@ -21,6 +21,7 @@ namespace ash {
class FrameCaptionButtonContainerView;
class HeaderView;
class ImmersiveFullscreenController;
+class ImmersiveFullscreenControllerDelegate;
// A NonClientFrameView used for packaged apps, dialogs and other non-browser
// windows. It supports immersive fullscreen. When in immersive fullscreen, the
@@ -33,7 +34,16 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
// Internal class name.
static const char kViewClassName[];
- explicit CustomFrameViewAsh(views::Widget* frame);
+ // |enable_immersive| controls whether ImmersiveFullscreenController is
+ // created for the CustomFrameViewAsh; if true and a WindowStateDelegate has
+ // not been set on the WindowState associated with |frame|, then an
+ // ImmersiveFullscreenController is created.
+ // If ImmersiveFullscreenControllerDelegate is not supplied, HeaderView is
+ // used as the ImmersiveFullscreenControllerDelegate.
+ explicit CustomFrameViewAsh(
+ views::Widget* frame,
+ ImmersiveFullscreenControllerDelegate* immersive_delegate = nullptr,
+ bool enable_immersive = true);
~CustomFrameViewAsh() override;
// Inits |immersive_fullscreen_controller| so that the controller reveals
@@ -94,6 +104,8 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
// View which contains the title and window controls.
HeaderView* header_view_;
+ ImmersiveFullscreenControllerDelegate* immersive_delegate_;
+
DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
};
« no previous file with comments | « no previous file | ash/common/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698