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: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h

Issue 2690443002: cros-md: Remove the non-MD immersive mode code paths (Closed)
Patch Set: remove pre-md tabstrip related code and fix Tabstrip::GetPreferredSize Created 3 years, 10 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
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
tdanderson 2017/02/14 17:14:38 nit: please remove BUG=614453 from the CL descript
Qiang(Joe) Xu 2017/02/14 17:36:38 Done.
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 <memory> 8 #include <memory>
9 9
tdanderson 2017/02/14 17:14:38 One last place it looks like you've missed for ful
Qiang(Joe) Xu 2017/02/14 17:36:38 Done.
10 #include "ash/common/shell_observer.h" 10 #include "ash/common/shell_observer.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
14 #include "chrome/browser/ui/views/tab_icon_view_model.h" 14 #include "chrome/browser/ui/views/tab_icon_view_model.h"
15 15
16 class TabIconView; 16 class TabIconView;
17 17
18 namespace ash { 18 namespace ash {
19 class FrameCaptionButtonContainerView; 19 class FrameCaptionButtonContainerView;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 AvatarDisplayOnTeleportedWindow); 80 AvatarDisplayOnTeleportedWindow);
81 friend class BrowserHeaderPainterAsh; 81 friend class BrowserHeaderPainterAsh;
82 82
83 // Distance between the left edge of the NonClientFrameView and the tab strip. 83 // Distance between the left edge of the NonClientFrameView and the tab strip.
84 int GetTabStripLeftInset() const; 84 int GetTabStripLeftInset() const;
85 85
86 // Distance between the right edge of the NonClientFrameView and the tab 86 // Distance between the right edge of the NonClientFrameView and the tab
87 // strip. 87 // strip.
88 int GetTabStripRightInset() const; 88 int GetTabStripRightInset() const;
89 89
90 // Returns true if we should use a super short header with light bars instead 90 // Returns true if immersive mode is enabled and not revealed.
91 // of regular tabs. This header is used in immersive fullscreen when the 91 bool IsImmersiveFullscreenUnrevealed() const;
92 // top-of-window views are not revealed.
93 bool UseImmersiveLightbarHeaderStyle() const;
94 92
95 // Returns true if the header should be painted so that it looks the same as 93 // Returns true if the header should be painted so that it looks the same as
96 // the header used for packaged apps. Packaged apps use a different color 94 // the header used for packaged apps. Packaged apps use a different color
97 // scheme than browser windows. 95 // scheme than browser windows.
98 bool UsePackagedAppHeaderStyle() const; 96 bool UsePackagedAppHeaderStyle() const;
99 97
100 void LayoutProfileIndicatorIcon(); 98 void LayoutProfileIndicatorIcon();
101 99
102 // Returns true if there is anything to paint. Some fullscreen windows do not 100 // Returns true if there is anything to paint. Some fullscreen windows do not
103 // need their frames painted. 101 // need their frames painted.
104 bool ShouldPaint() const; 102 bool ShouldPaint() const;
105 103
106 void PaintToolbarBackground(gfx::Canvas* canvas); 104 void PaintToolbarBackground(gfx::Canvas* canvas);
107 105
108 // View which contains the window controls. 106 // View which contains the window controls.
109 ash::FrameCaptionButtonContainerView* caption_button_container_; 107 ash::FrameCaptionButtonContainerView* caption_button_container_;
110 108
111 // For popups, the window icon. 109 // For popups, the window icon.
112 TabIconView* window_icon_; 110 TabIconView* window_icon_;
113 111
114 // Helper class for painting the header. 112 // Helper class for painting the header.
115 std::unique_ptr<ash::HeaderPainter> header_painter_; 113 std::unique_ptr<ash::HeaderPainter> header_painter_;
116 114
117 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 115 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
118 }; 116 };
119 117
120 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 118 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698