From 299fb9033f17aa3fa5d2acda1a6b8a0fad7aa876 Mon Sep 17 00:00:00 2001 From: "sidchat@chromium.org" Date: Wed, 30 Sep 2009 17:47:23 +0000 Subject: 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 --- chrome/browser/views/extensions/extension_shelf.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'chrome/browser/views') 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(child)); - if (!toolstrip) - return; - PreferredSizeChanged(); } -- cgit v1.1