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

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

Issue 664443002: Support chrome app frame colors on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comment Created 6 years, 2 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 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 "ui/views/window/non_client_view.h" 11 #include "ui/views/window/non_client_view.h"
11 12
12 namespace ash { 13 namespace ash {
13 class FrameBorderHitTestController; 14 class FrameBorderHitTestController;
14 class FrameCaptionButtonContainerView; 15 class FrameCaptionButtonContainerView;
15 class ImmersiveFullscreenController; 16 class ImmersiveFullscreenController;
16 } 17 }
17 namespace views { 18 namespace views {
18 class Widget; 19 class Widget;
19 } 20 }
(...skipping 14 matching lines...) Expand all
34 explicit CustomFrameViewAsh(views::Widget* frame); 35 explicit CustomFrameViewAsh(views::Widget* frame);
35 virtual ~CustomFrameViewAsh(); 36 virtual ~CustomFrameViewAsh();
36 37
37 // Inits |immersive_fullscreen_controller| so that the controller reveals 38 // Inits |immersive_fullscreen_controller| so that the controller reveals
38 // and hides |header_view_| in immersive fullscreen. 39 // and hides |header_view_| in immersive fullscreen.
39 // CustomFrameViewAsh does not take ownership of 40 // CustomFrameViewAsh does not take ownership of
40 // |immersive_fullscreen_controller|. 41 // |immersive_fullscreen_controller|.
41 void InitImmersiveFullscreenControllerForView( 42 void InitImmersiveFullscreenControllerForView(
42 ImmersiveFullscreenController* immersive_fullscreen_controller); 43 ImmersiveFullscreenController* immersive_fullscreen_controller);
43 44
45 // Sets the active and inactive frame colors. Note the inactive frame color
46 // will have some transparency added when the frame is drawn.
47 void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
48
44 // views::NonClientFrameView: 49 // views::NonClientFrameView:
45 virtual gfx::Rect GetBoundsForClientView() const override; 50 virtual gfx::Rect GetBoundsForClientView() const override;
46 virtual gfx::Rect GetWindowBoundsForClientBounds( 51 virtual gfx::Rect GetWindowBoundsForClientBounds(
47 const gfx::Rect& client_bounds) const override; 52 const gfx::Rect& client_bounds) const override;
48 virtual int NonClientHitTest(const gfx::Point& point) override; 53 virtual int NonClientHitTest(const gfx::Point& point) override;
49 virtual void GetWindowMask(const gfx::Size& size, 54 virtual void GetWindowMask(const gfx::Size& size,
50 gfx::Path* window_mask) override; 55 gfx::Path* window_mask) override;
51 virtual void ResetWindowControls() override; 56 virtual void ResetWindowControls() override;
52 virtual void UpdateWindowIcon() override; 57 virtual void UpdateWindowIcon() override;
53 virtual void UpdateWindowTitle() override; 58 virtual void UpdateWindowTitle() override;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 96
92 // Updates the hittest bounds overrides based on the window state type. 97 // Updates the hittest bounds overrides based on the window state type.
93 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 98 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
94 99
95 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 100 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
96 }; 101 };
97 102
98 } // namespace ash 103 } // namespace ash
99 104
100 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 105 #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