chrome/browser/chromeos/options/network_config_view.cc - Issue 273223002: views: Make view::Views::GetPreferredSize() const.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/options/network_config_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:

Index: chrome/browser/chromeos/options/network_config_view.cc

diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc

index a3f7442cd0ef600e1f13c3794bacc7705b98d280..9938176e80ee940e3c0485995cc1c39bbeb88856 100644

--- a/chrome/browser/chromeos/options/network_config_view.cc

+++ b/chrome/browser/chromeos/options/network_config_view.cc

@@ -252,7 +252,7 @@ void NetworkConfigView::Layout() {

child_config_view_->SetBounds(0, 0, width(), height());

}

-gfx::Size NetworkConfigView::GetPreferredSize() {

+gfx::Size NetworkConfigView::GetPreferredSize() const {

gfx::Size result(views::Widget::GetLocalizedContentsSize(

IDS_JOIN_WIFI_NETWORK_DIALOG_WIDTH_CHARS,

IDS_JOIN_WIFI_NETWORK_DIALOG_MINIMUM_HEIGHT_LINES));

@@ -336,7 +336,7 @@ void ControlledSettingIndicatorView::Update(

PreferredSizeChanged();

}

-gfx::Size ControlledSettingIndicatorView::GetPreferredSize() {

+gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const {

return (managed_ && visible()) ? image_view_->GetPreferredSize()

: gfx::Size();

}