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

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

Issue 1441683007: exo: Add "back" button to shell surface decorations. Base URL: https://chromium.googlesource.com/chromium/src.git@exosphere-subcompositor
Patch Set: rebase Created 5 years 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
« no previous file with comments | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_FRAME_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 "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
11 #include "ui/views/window/non_client_view.h" 11 #include "ui/views/window/non_client_view.h"
12 12
13 namespace ash { 13 namespace ash {
14 class FrameBorderHitTestController; 14 class FrameBorderHitTestController;
15 class FrameCaptionButton;
15 class FrameCaptionButtonContainerView; 16 class FrameCaptionButtonContainerView;
16 class ImmersiveFullscreenController; 17 class ImmersiveFullscreenController;
17 } 18 }
18 namespace views { 19 namespace views {
19 class Widget; 20 class Widget;
20 } 21 }
21 22
22 namespace ash { 23 namespace ash {
23 24
24 // A NonClientFrameView used for packaged apps, dialogs and other non-browser 25 // A NonClientFrameView used for packaged apps, dialogs and other non-browser
(...skipping 14 matching lines...) Expand all
39 // and hides |header_view_| in immersive fullscreen. 40 // and hides |header_view_| in immersive fullscreen.
40 // CustomFrameViewAsh does not take ownership of 41 // CustomFrameViewAsh does not take ownership of
41 // |immersive_fullscreen_controller|. 42 // |immersive_fullscreen_controller|.
42 void InitImmersiveFullscreenControllerForView( 43 void InitImmersiveFullscreenControllerForView(
43 ImmersiveFullscreenController* immersive_fullscreen_controller); 44 ImmersiveFullscreenController* immersive_fullscreen_controller);
44 45
45 // Sets the active and inactive frame colors. Note the inactive frame color 46 // Sets the active and inactive frame colors. Note the inactive frame color
46 // will have some transparency added when the frame is drawn. 47 // will have some transparency added when the frame is drawn.
47 void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color); 48 void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
48 49
50 // Sets the left caption button.
51 void SetLeftCaptionButton(FrameCaptionButton* left_caption_button);
52
49 // views::NonClientFrameView: 53 // views::NonClientFrameView:
50 gfx::Rect GetBoundsForClientView() const override; 54 gfx::Rect GetBoundsForClientView() const override;
51 gfx::Rect GetWindowBoundsForClientBounds( 55 gfx::Rect GetWindowBoundsForClientBounds(
52 const gfx::Rect& client_bounds) const override; 56 const gfx::Rect& client_bounds) const override;
53 int NonClientHitTest(const gfx::Point& point) override; 57 int NonClientHitTest(const gfx::Point& point) override;
54 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override; 58 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
55 void ResetWindowControls() override; 59 void ResetWindowControls() override;
56 void UpdateWindowIcon() override; 60 void UpdateWindowIcon() override;
57 void UpdateWindowTitle() override; 61 void UpdateWindowTitle() override;
58 void SizeConstraintsChanged() override; 62 void SizeConstraintsChanged() override;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 98
95 // Updates the hittest bounds overrides based on the window state type. 99 // Updates the hittest bounds overrides based on the window state type.
96 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 100 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
97 101
98 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 102 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
99 }; 103 };
100 104
101 } // namespace ash 105 } // namespace ash
102 106
103 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 107 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698