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

Side by Side Diff: chrome/browser/views/frame/opaque_non_client_view.h

Issue 17362: Pixel perfection on OTR icon. The tabstrip is still positioned/sized wrong r... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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/views/frame/opaque_non_client_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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_
7 7
8 #include "chrome/browser/views/frame/opaque_frame.h" 8 #include "chrome/browser/views/frame/opaque_frame.h"
9 #include "chrome/browser/views/tab_icon_view.h" 9 #include "chrome/browser/views/tab_icon_view.h"
10 #include "chrome/views/non_client_view.h" 10 #include "chrome/views/non_client_view.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual void SetAccessibleName(const std::wstring& name); 70 virtual void SetAccessibleName(const std::wstring& name);
71 71
72 private: 72 private:
73 // Returns the height of the non-client area at the top of the window (the 73 // Returns the height of the non-client area at the top of the window (the
74 // title bar, etc). 74 // title bar, etc).
75 int CalculateNonClientTopHeight() const; 75 int CalculateNonClientTopHeight() const;
76 76
77 // Paint various sub-components of this view. 77 // Paint various sub-components of this view.
78 void PaintFrameBorder(ChromeCanvas* canvas); 78 void PaintFrameBorder(ChromeCanvas* canvas);
79 void PaintMaximizedFrameBorder(ChromeCanvas* canvas); 79 void PaintMaximizedFrameBorder(ChromeCanvas* canvas);
80 void PaintOTRAvatar(ChromeCanvas* canvas);
81 void PaintDistributorLogo(ChromeCanvas* canvas); 80 void PaintDistributorLogo(ChromeCanvas* canvas);
82 void PaintTitleBar(ChromeCanvas* canvas); 81 void PaintTitleBar(ChromeCanvas* canvas);
83 void PaintToolbarBackground(ChromeCanvas* canvas); 82 void PaintToolbarBackground(ChromeCanvas* canvas);
83 void PaintOTRAvatar(ChromeCanvas* canvas);
84 void PaintClientEdge(ChromeCanvas* canvas); 84 void PaintClientEdge(ChromeCanvas* canvas);
85 void PaintMaximizedClientEdge(ChromeCanvas* canvas); 85 void PaintMaximizedClientEdge(ChromeCanvas* canvas);
86 86
87 // Layout various sub-components of this view. 87 // Layout various sub-components of this view.
88 void LayoutWindowControls(); 88 void LayoutWindowControls();
89 void LayoutOTRAvatar();
90 void LayoutDistributorLogo(); 89 void LayoutDistributorLogo();
91 void LayoutTitleBar(); 90 void LayoutTitleBar();
91 void LayoutOTRAvatar();
92 void LayoutClientView(); 92 void LayoutClientView();
93 93
94 // Returns the set of resources to use to paint this view. 94 // Returns the set of resources to use to paint this view.
95 views::WindowResources* resources() const { 95 views::WindowResources* resources() const {
96 return frame_->is_active() || paint_as_active() ? 96 return frame_->is_active() || paint_as_active() ?
97 current_active_resources_ : current_inactive_resources_; 97 current_active_resources_ : current_inactive_resources_;
98 } 98 }
99 99
100 // The layout rect of the title, if visible. 100 // The layout rect of the title, if visible.
101 gfx::Rect title_bounds_; 101 gfx::Rect title_bounds_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 static views::WindowResources* inactive_resources_; 141 static views::WindowResources* inactive_resources_;
142 static views::WindowResources* active_otr_resources_; 142 static views::WindowResources* active_otr_resources_;
143 static views::WindowResources* inactive_otr_resources_; 143 static views::WindowResources* inactive_otr_resources_;
144 static ChromeFont title_font_; 144 static ChromeFont title_font_;
145 145
146 DISALLOW_EVIL_CONSTRUCTORS(OpaqueNonClientView); 146 DISALLOW_EVIL_CONSTRUCTORS(OpaqueNonClientView);
147 }; 147 };
148 148
149 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_ 149 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_
150 150
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/frame/opaque_non_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698