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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/toolbar/wrench_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 8566c842aae5c24d2abefcbcf2dedda8b86bc9e5..cbaea00525fa16838345ffa9f7cc8eecc039702f 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -538,7 +538,7 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, views::View overrides:
-gfx::Size ToolbarView::GetPreferredSize() {
+gfx::Size ToolbarView::GetPreferredSize() const {
gfx::Size size(location_bar_->GetPreferredSize());
if (is_display_mode_normal()) {
int content_width = kLeftEdgeSpacing + back_->GetPreferredSize().width() +
@@ -554,7 +554,7 @@ gfx::Size ToolbarView::GetPreferredSize() {
return SizeForContentSize(size);
}
-gfx::Size ToolbarView::GetMinimumSize() {
+gfx::Size ToolbarView::GetMinimumSize() const {
gfx::Size size(location_bar_->GetMinimumSize());
if (is_display_mode_normal()) {
int content_width = kLeftEdgeSpacing + back_->GetMinimumSize().width() +
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/toolbar/wrench_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698