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

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

Issue 8172010: Account for minimum tabstrip width in opaque browser frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/opaque_browser_frame_view.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 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 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/views/frame/browser_frame.h" 10 #include "chrome/browser/ui/views/frame/browser_frame.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 int TitlebarBottomThickness(bool restored) const; 113 int TitlebarBottomThickness(bool restored) const;
114 114
115 // Returns the size of the titlebar icon. This is used even when the icon is 115 // Returns the size of the titlebar icon. This is used even when the icon is
116 // not shown, e.g. to set the titlebar height. 116 // not shown, e.g. to set the titlebar height.
117 int IconSize() const; 117 int IconSize() const;
118 118
119 // Returns the bounds of the titlebar icon (or where the icon would be if 119 // Returns the bounds of the titlebar icon (or where the icon would be if
120 // there was one). 120 // there was one).
121 gfx::Rect IconBounds() const; 121 gfx::Rect IconBounds() const;
122 122
123 // Returns the combined bounds for the tab strip and avatar area.
124 gfx::Rect GetBoundsForTabStripAndAvatarArea(views::View* tabstrip) const;
125
123 // Paint various sub-components of this view. The *FrameBorder() functions 126 // Paint various sub-components of this view. The *FrameBorder() functions
124 // also paint the background of the titlebar area, since the top frame border 127 // also paint the background of the titlebar area, since the top frame border
125 // and titlebar background are a contiguous component. 128 // and titlebar background are a contiguous component.
126 void PaintRestoredFrameBorder(gfx::Canvas* canvas); 129 void PaintRestoredFrameBorder(gfx::Canvas* canvas);
127 void PaintMaximizedFrameBorder(gfx::Canvas* canvas); 130 void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
128 void PaintTitleBar(gfx::Canvas* canvas); 131 void PaintTitleBar(gfx::Canvas* canvas);
129 void PaintToolbarBackground(gfx::Canvas* canvas); 132 void PaintToolbarBackground(gfx::Canvas* canvas);
130 void PaintRestoredClientEdge(gfx::Canvas* canvas); 133 void PaintRestoredClientEdge(gfx::Canvas* canvas);
131 134
132 // Compute aspects of the frame needed to paint the frame background. 135 // Compute aspects of the frame needed to paint the frame background.
(...skipping 30 matching lines...) Expand all
163 166
164 content::NotificationRegistrar registrar_; 167 content::NotificationRegistrar registrar_;
165 168
166 // Background painter for the window frame. 169 // Background painter for the window frame.
167 scoped_ptr<views::FrameBackground> frame_background_; 170 scoped_ptr<views::FrameBackground> frame_background_;
168 171
169 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 172 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
170 }; 173 };
171 174
172 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 175 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | 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