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

Side by Side Diff: ash/wm/custom_frame_view_ash.h

Issue 59043013: Add flag to enable immersive fullscreen for v2 apps (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 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 ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
11 11
12 namespace ash { 12 namespace ash {
13 class FrameBorderHitTestController; 13 class FrameBorderHitTestController;
14 class HeaderPainter; 14 class HeaderPainter;
15 class ImmersiveFullscreenController;
15 } 16 }
16 namespace gfx { 17 namespace gfx {
17 class Font; 18 class Font;
18 } 19 }
19 namespace views { 20 namespace views {
20 class Widget; 21 class Widget;
21 } 22 }
22 23
23 namespace ash { 24 namespace ash {
24 25
25 class FrameCaptionButtonContainerView; 26 class FrameCaptionButtonContainerView;
26 27
27 // A NonClientFrameView used for dialogs and other non-browser windows. 28 // A NonClientFrameView which supports immersive fullscreen which is used for
29 // packaged apps, dialogs and other non-browser windows. When in immersive
oshima 2013/11/08 23:25:32 Can you rephrase so that whether or not this is us
30 // fullscreen, the client view takes up the entire widget and the window header
31 // is an overlay. The window header overlay slides onscreen when the user hovers
32 // the mouse at the top of the screen.
28 // See also views::CustomFrameView and BrowserNonClientFrameViewAsh. 33 // See also views::CustomFrameView and BrowserNonClientFrameViewAsh.
29 class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { 34 class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
30 public: 35 public:
31 // Internal class name. 36 // Internal class name.
32 static const char kViewClassName[]; 37 static const char kViewClassName[];
33 38
34 explicit CustomFrameViewAsh(views::Widget* frame); 39 explicit CustomFrameViewAsh(views::Widget* frame);
35 virtual ~CustomFrameViewAsh(); 40 virtual ~CustomFrameViewAsh();
36 41
42 // Inits |immersive_fullscreen_controller| so that the controller reveals
43 // and hides |header_view_| in immersive fullscreen.
oshima 2013/11/08 23:25:32 can you mention ownership?
44 void InitImmersiveFullscreenControllerForView(
45 ImmersiveFullscreenController* immersive_fullscreen_controller);
46
37 // views::NonClientFrameView overrides: 47 // views::NonClientFrameView overrides:
38 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 48 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
39 virtual gfx::Rect GetWindowBoundsForClientBounds( 49 virtual gfx::Rect GetWindowBoundsForClientBounds(
40 const gfx::Rect& client_bounds) const OVERRIDE; 50 const gfx::Rect& client_bounds) const OVERRIDE;
41 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 51 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
42 virtual void GetWindowMask(const gfx::Size& size, 52 virtual void GetWindowMask(const gfx::Size& size,
43 gfx::Path* window_mask) OVERRIDE; 53 gfx::Path* window_mask) OVERRIDE;
44 virtual void ResetWindowControls() OVERRIDE; 54 virtual void ResetWindowControls() OVERRIDE;
45 virtual void UpdateWindowIcon() OVERRIDE; 55 virtual void UpdateWindowIcon() OVERRIDE;
46 virtual void UpdateWindowTitle() OVERRIDE; 56 virtual void UpdateWindowTitle() OVERRIDE;
57 virtual void ShouldPaintAsActiveChanged() OVERRIDE;
47 58
48 // views::View overrides: 59 // views::View overrides:
49 virtual gfx::Size GetPreferredSize() OVERRIDE; 60 virtual gfx::Size GetPreferredSize() OVERRIDE;
50 virtual void Layout() OVERRIDE;
51 virtual const char* GetClassName() const OVERRIDE; 61 virtual const char* GetClassName() const OVERRIDE;
52 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
53 virtual gfx::Size GetMinimumSize() OVERRIDE; 62 virtual gfx::Size GetMinimumSize() OVERRIDE;
54 virtual gfx::Size GetMaximumSize() OVERRIDE; 63 virtual gfx::Size GetMaximumSize() OVERRIDE;
64 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
55 65
56 private: 66 private:
67 class OverlayView;
68
57 // Height from top of window to top of client area. 69 // Height from top of window to top of client area.
58 int NonClientTopBorderHeight() const; 70 int NonClientTopBorderHeight() const;
59 71
60 // Not owned. 72 // Not owned.
61 views::Widget* frame_; 73 views::Widget* frame_;
62 74
63 // View which contains the window controls. 75 // View which contains the title and window controls.
64 FrameCaptionButtonContainerView* caption_button_container_; 76 class HeaderView;
65 77 HeaderView* header_view_;
66 // Helper class for painting the header.
67 scoped_ptr<HeaderPainter> header_painter_;
68 78
69 // Updates the hittest bounds overrides based on the window show type. 79 // Updates the hittest bounds overrides based on the window show type.
70 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 80 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
71 81
72 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 82 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
73 }; 83 };
74 84
75 } // namespace ash 85 } // namespace ash
76 86
77 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 87 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698