diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 21:34:11 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 21:34:11 +0000 |
commit | 1f74cfc185bb4d47532994a206a901bc708d3ff6 (patch) | |
tree | 93d7602cc3b4420c66d08fc5ece46618bff24dc7 /chrome/browser/views/extensions | |
parent | f0a5d7cd1a65d7ff71299f95ee78929729694f25 (diff) | |
download | chromium_src-1f74cfc185bb4d47532994a206a901bc708d3ff6.zip chromium_src-1f74cfc185bb4d47532994a206a901bc708d3ff6.tar.gz chromium_src-1f74cfc185bb4d47532994a206a901bc708d3ff6.tar.bz2 |
Correctly handle extensions width in the GTK extension shelf.
Also make the method name used on Windows shorter and more obvious.
TEST=none
http://crbug.com/16759
Review URL: http://codereview.chromium.org/164092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/extensions')
-rw-r--r-- | chrome/browser/views/extensions/extension_view.cc | 4 | ||||
-rw-r--r-- | chrome/browser/views/extensions/extension_view.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/extensions/extension_view.cc b/chrome/browser/views/extensions/extension_view.cc index 1518567..63f37db 100644 --- a/chrome/browser/views/extensions/extension_view.cc +++ b/chrome/browser/views/extensions/extension_view.cc @@ -103,7 +103,7 @@ void ExtensionView::ShowIfCompletelyLoaded() { !is_clipped_ && did_insert_css_ && !render_view_host()->view()->background().empty()) { SetVisible(true); - DidContentsPreferredWidthChange(pending_preferred_width_); + UpdatePreferredWidth(pending_preferred_width_); } } @@ -124,7 +124,7 @@ void ExtensionView::SetBackground(const SkBitmap& background) { ShowIfCompletelyLoaded(); } -void ExtensionView::DidContentsPreferredWidthChange(const int pref_width) { +void ExtensionView::UpdatePreferredWidth(int pref_width) { // Don't actually do anything with this information until we have been shown. // Size changes will not be honored by lower layers while we are hidden. gfx::Size preferred_size = GetPreferredSize(); diff --git a/chrome/browser/views/extensions/extension_view.h b/chrome/browser/views/extensions/extension_view.h index df3ca2d..75f7a3f 100644 --- a/chrome/browser/views/extensions/extension_view.h +++ b/chrome/browser/views/extensions/extension_view.h @@ -42,7 +42,7 @@ class ExtensionView : public views::NativeViewHost { void set_is_toolstrip(bool is) { is_toolstrip_ = is; } // Notification from ExtensionHost. - void DidContentsPreferredWidthChange(const int pref_width); + void UpdatePreferredWidth(int pref_width); void HandleMouseEvent(); void HandleMouseLeave(); |