chrome/browser/ui/views/website_settings/permission_selector_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/ui/views/website_settings/permission_selector_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/validation_message_bubble_delegate.cc ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc

diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc

index e8d28b5ad5f0d0ddc67de3d68c1d50f7a7894896..883fc38508f4b31f1cd554a5c5b10bb0ed33d3c8 100644

--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc

+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc

@@ -46,7 +46,7 @@ class PermissionMenuButton : public views::MenuButton,

virtual ~PermissionMenuButton();

// Overridden from views::MenuButton.

- virtual gfx::Size GetPreferredSize() OVERRIDE;

+ virtual gfx::Size GetPreferredSize() const OVERRIDE;

// Overridden from views::TextButton.

virtual void SetText(const base::string16& text) OVERRIDE;

@@ -85,7 +85,7 @@ PermissionMenuButton::PermissionMenuButton(const base::string16& text,

PermissionMenuButton::~PermissionMenuButton() {

}

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

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

gfx::Insets insets = GetInsets();

// Scale the button to the current text size.

gfx::Size prefsize(text_size_.width() + insets.width(),