diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 16:41:08 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 16:41:08 +0000 |
| commit | 9b0ef8e19d6777eaaef052f804cb8c5df9025995 (patch) | |
| tree | a81699057922e9bb9a8f11954c10189b6d140428 /chrome/browser/views | |
| parent | abc56b00e500637ee7d4b203b87613e382dfc7f5 (diff) | |
| download | chromium_src-9b0ef8e19d6777eaaef052f804cb8c5df9025995.zip chromium_src-9b0ef8e19d6777eaaef052f804cb8c5df9025995.tar.gz chromium_src-9b0ef8e19d6777eaaef052f804cb8c5df9025995.tar.bz2 | |
Oops, forgot to save this variable rename before committing.
BUG=41113
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/content_setting_bubble_contents.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/content_setting_bubble_contents.cc b/chrome/browser/views/content_setting_bubble_contents.cc index 51666840..cea404d 100644 --- a/chrome/browser/views/content_setting_bubble_contents.cc +++ b/chrome/browser/views/content_setting_bubble_contents.cc @@ -125,11 +125,11 @@ ContentSettingBubbleContents::~ContentSettingBubbleContents() { gfx::Size ContentSettingBubbleContents::GetPreferredSize() { gfx::Size preferred_size(views::View::GetPreferredSize()); - int min_width = + int preferred_width = (!content_setting_bubble_model_->bubble_content().domain_lists.empty() && (kMinMultiLineContentsWidth > preferred_size.width())) ? kMinMultiLineContentsWidth : preferred_size.width(); - preferred_size.set_width(std::min(min_width, kMaxContentsWidth)); + preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth)); return preferred_size; } |