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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h

Issue 1685763004: Fix various issues with popup/app window layout/drawing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: Fix unittest Created 4 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
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/macros.h" 10 #include "base/macros.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 // Layout the avatar button. 115 // Layout the avatar button.
116 void LayoutAvatar(); 116 void LayoutAvatar();
117 117
118 // Returns true if there is anything to paint. Some fullscreen windows do not 118 // Returns true if there is anything to paint. Some fullscreen windows do not
119 // need their frames painted. 119 // need their frames painted.
120 bool ShouldPaint() const; 120 bool ShouldPaint() const;
121 121
122 void PaintToolbarBackground(gfx::Canvas* canvas); 122 void PaintToolbarBackground(gfx::Canvas* canvas);
123 123
124 // Draws the line under the header for windows without a toolbar and not using
125 // the packaged app header style.
126 void PaintContentEdge(gfx::Canvas* canvas);
127
128 // View which contains the window controls. 124 // View which contains the window controls.
129 ash::FrameCaptionButtonContainerView* caption_button_container_; 125 ash::FrameCaptionButtonContainerView* caption_button_container_;
130 126
131 // The holder for the buttons on the left side of the header. This is included 127 // The holder for the buttons on the left side of the header. This is included
132 // for web app style frames, and includes a back button and location icon. 128 // for web app style frames, and includes a back button and location icon.
133 WebAppLeftHeaderView* web_app_left_header_view_; 129 WebAppLeftHeaderView* web_app_left_header_view_;
134 130
135 // For popups, the window icon. 131 // For popups, the window icon.
136 TabIconView* window_icon_; 132 TabIconView* window_icon_;
137 133
138 // Helper class for painting the header. 134 // Helper class for painting the header.
139 scoped_ptr<ash::HeaderPainter> header_painter_; 135 scoped_ptr<ash::HeaderPainter> header_painter_;
140 136
141 // Updates the hittest bounds overrides based on the window show type. 137 // Updates the hittest bounds overrides based on the window show type.
142 scoped_ptr<ash::FrameBorderHitTestController> 138 scoped_ptr<ash::FrameBorderHitTestController>
143 frame_border_hit_test_controller_; 139 frame_border_hit_test_controller_;
144 140
145 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 141 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
146 }; 142 };
147 143
148 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 144 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/layout_constants.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698