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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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
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 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 int OpaqueBrowserFrameView::GetThemeBackgroundXInset() const { 184 int OpaqueBrowserFrameView::GetThemeBackgroundXInset() const {
185 return 0; 185 return 0;
186 } 186 }
187 187
188 void OpaqueBrowserFrameView::UpdateThrobber(bool running) { 188 void OpaqueBrowserFrameView::UpdateThrobber(bool running) {
189 if (window_icon_) 189 if (window_icon_)
190 window_icon_->Update(); 190 window_icon_->Update();
191 } 191 }
192 192
193 gfx::Size OpaqueBrowserFrameView::GetMinimumSize() { 193 gfx::Size OpaqueBrowserFrameView::GetMinimumSize() const {
194 return layout_->GetMinimumSize(width()); 194 return layout_->GetMinimumSize(width());
195 } 195 }
196 196
197 /////////////////////////////////////////////////////////////////////////////// 197 ///////////////////////////////////////////////////////////////////////////////
198 // OpaqueBrowserFrameView, views::NonClientFrameView implementation: 198 // OpaqueBrowserFrameView, views::NonClientFrameView implementation:
199 199
200 gfx::Rect OpaqueBrowserFrameView::GetBoundsForClientView() const { 200 gfx::Rect OpaqueBrowserFrameView::GetBoundsForClientView() const {
201 return layout_->client_view_bounds(); 201 return layout_->client_view_bounds();
202 } 202 }
203 203
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 902
903 int OpaqueBrowserFrameView::GetTopAreaHeight() const { 903 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
904 gfx::ImageSkia* frame_image = GetFrameImage(); 904 gfx::ImageSkia* frame_image = GetFrameImage();
905 int top_area_height = frame_image->height(); 905 int top_area_height = frame_image->height();
906 if (browser_view()->IsTabStripVisible()) { 906 if (browser_view()->IsTabStripVisible()) {
907 top_area_height = std::max(top_area_height, 907 top_area_height = std::max(top_area_height,
908 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); 908 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
909 } 909 }
910 return top_area_height; 910 return top_area_height;
911 } 911 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698