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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.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_OPAQUE_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // also paint the background of the titlebar area, since the top frame border 141 // also paint the background of the titlebar area, since the top frame border
142 // and titlebar background are a contiguous component. 142 // and titlebar background are a contiguous component.
143 void PaintRestoredFrameBorder(gfx::Canvas* canvas) const; 143 void PaintRestoredFrameBorder(gfx::Canvas* canvas) const;
144 void PaintMaximizedFrameBorder(gfx::Canvas* canvas) const; 144 void PaintMaximizedFrameBorder(gfx::Canvas* canvas) const;
145 void PaintToolbarBackground(gfx::Canvas* canvas) const; 145 void PaintToolbarBackground(gfx::Canvas* canvas) const;
146 void PaintClientEdge(gfx::Canvas* canvas) const; 146 void PaintClientEdge(gfx::Canvas* canvas) const;
147 void FillClientEdgeRects(int x, 147 void FillClientEdgeRects(int x,
148 int y, 148 int y,
149 int w, 149 int w,
150 int h, 150 int h,
151 bool draw_bottom,
151 SkColor color, 152 SkColor color,
152 gfx::Canvas* canvas) const; 153 gfx::Canvas* canvas) const;
153 154
154 // Our layout manager also calculates various bounds. 155 // Our layout manager also calculates various bounds.
155 OpaqueBrowserFrameViewLayout* layout_; 156 OpaqueBrowserFrameViewLayout* layout_;
156 157
157 // Window controls. 158 // Window controls.
158 views::ImageButton* minimize_button_; 159 views::ImageButton* minimize_button_;
159 views::ImageButton* maximize_button_; 160 views::ImageButton* maximize_button_;
160 views::ImageButton* restore_button_; 161 views::ImageButton* restore_button_;
161 views::ImageButton* close_button_; 162 views::ImageButton* close_button_;
162 163
163 // The window icon and title. 164 // The window icon and title.
164 TabIconView* window_icon_; 165 TabIconView* window_icon_;
165 views::Label* window_title_; 166 views::Label* window_title_;
166 167
167 // Background painter for the window frame. 168 // Background painter for the window frame.
168 scoped_ptr<views::FrameBackground> frame_background_; 169 scoped_ptr<views::FrameBackground> frame_background_;
169 170
170 // Observer that handles platform dependent configuration. 171 // Observer that handles platform dependent configuration.
171 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; 172 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
172 173
173 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 174 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
174 }; 175 };
175 176
176 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 177 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698