diff options
| author | sidchat@chromium.org <sidchat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 17:47:23 +0000 |
|---|---|---|
| committer | sidchat@chromium.org <sidchat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 17:47:23 +0000 |
| commit | 299fb9033f17aa3fa5d2acda1a6b8a0fad7aa876 (patch) | |
| tree | d8fe72fedd4be1adab31cd9c9e919c23a650e224 /chrome/browser/views | |
| parent | 5ed0c5ad10a6bca737bddba34f89291884420d0d (diff) | |
| download | chromium_src-299fb9033f17aa3fa5d2acda1a6b8a0fad7aa876.zip chromium_src-299fb9033f17aa3fa5d2acda1a6b8a0fad7aa876.tar.gz chromium_src-299fb9033f17aa3fa5d2acda1a6b8a0fad7aa876.tar.bz2 | |
Make moles work for --show-extensions-on-top.
BUG=www.crbug.com/21271
TEST=none
Review URL: http://codereview.chromium.org/249033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/extensions/extension_shelf.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/views/extensions/extension_shelf.cc b/chrome/browser/views/extensions/extension_shelf.cc index 83ea7d1..eee60a1 100644 --- a/chrome/browser/views/extensions/extension_shelf.cc +++ b/chrome/browser/views/extensions/extension_shelf.cc @@ -455,7 +455,14 @@ void ExtensionShelf::Toolstrip::LayoutWindow() { // level widget, we need to do some coordinate conversion to get this right. gfx::Point origin(-kToolstripPadding, 0); if (expanded_ || mole_animation_->IsAnimating()) { - origin.set_y(GetShelfView()->height() - window_size.height()); + if (shelf_->IsOnTop()) { + if (handle_visible_) + origin.set_y(-GetHandlePreferredSize().height()); + else + origin.set_y(0); + } else { + origin.set_y(GetShelfView()->height() - window_size.height()); + } views::View::ConvertPointToView(GetShelfView(), shelf_->GetRootView(), &origin); } else { @@ -763,10 +770,6 @@ gfx::Size ExtensionShelf::GetPreferredSize() { } void ExtensionShelf::ChildPreferredSizeChanged(View* child) { - Toolstrip *toolstrip = ToolstripForView(static_cast<ExtensionView*>(child)); - if (!toolstrip) - return; - PreferredSizeChanged(); } |