| OLD | NEW |
| 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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
| 7 | 7 |
| 8 #include "ash/shell_observer.h" | 8 #include "ash/shell_observer.h" |
| 9 #include "base/gtest_prod_util.h" | 9 #include "base/gtest_prod_util.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 // Returns true if the header should be painted so that it looks the same as | 108 // Returns true if the header should be painted so that it looks the same as |
| 109 // the header used for packaged apps. Packaged apps use a different color | 109 // the header used for packaged apps. Packaged apps use a different color |
| 110 // scheme than browser windows. | 110 // scheme than browser windows. |
| 111 bool UsePackagedAppHeaderStyle() const; | 111 bool UsePackagedAppHeaderStyle() const; |
| 112 | 112 |
| 113 // Returns true if the header should be painted with a WebApp header style. | 113 // Returns true if the header should be painted with a WebApp header style. |
| 114 // The WebApp header style has a back button and title along with the usual | 114 // The WebApp header style has a back button and title along with the usual |
| 115 // accoutrements. | 115 // accoutrements. |
| 116 bool UseWebAppHeaderStyle() const; | 116 bool UseWebAppHeaderStyle() const; |
| 117 | 117 |
| 118 // Layout the incognito icon. | 118 // Layout the avatar button. |
| 119 void LayoutAvatar(); | 119 void LayoutAvatar(); |
| 120 void LayoutNewStyleAvatar(); |
| 120 | 121 |
| 121 // Returns true if there is anything to paint. Some fullscreen windows do not | 122 // Returns true if there is anything to paint. Some fullscreen windows do not |
| 122 // need their frames painted. | 123 // need their frames painted. |
| 123 bool ShouldPaint() const; | 124 bool ShouldPaint() const; |
| 124 | 125 |
| 125 // Paints the header background when the frame is in immersive fullscreen and | 126 // Paints the header background when the frame is in immersive fullscreen and |
| 126 // tab light bar is visible. | 127 // tab light bar is visible. |
| 127 void PaintImmersiveLightbarStyleHeader(gfx::Canvas* canvas); | 128 void PaintImmersiveLightbarStyleHeader(gfx::Canvas* canvas); |
| 128 | 129 |
| 129 void PaintToolbarBackground(gfx::Canvas* canvas); | 130 void PaintToolbarBackground(gfx::Canvas* canvas); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 148 scoped_ptr<ash::HeaderPainter> header_painter_; | 149 scoped_ptr<ash::HeaderPainter> header_painter_; |
| 149 | 150 |
| 150 // Updates the hittest bounds overrides based on the window show type. | 151 // Updates the hittest bounds overrides based on the window show type. |
| 151 scoped_ptr<ash::FrameBorderHitTestController> | 152 scoped_ptr<ash::FrameBorderHitTestController> |
| 152 frame_border_hit_test_controller_; | 153 frame_border_hit_test_controller_; |
| 153 | 154 |
| 154 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 155 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
| 155 }; | 156 }; |
| 156 | 157 |
| 157 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 158 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
| OLD | NEW |