Some layout related fixes for the app launchers....

chrome/browser/views/app_launcher.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/app_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 325 matching lines @@
   view_win->ShowWindow(SW_SHOW);
 #endif
   render_view_container_->Attach(app_launcher_->rwhv_->GetNativeView());
 
   navigation_bar_ = new NavigationBar(app_launcher_);
   AddChildView(navigation_bar_);
 }
 
 gfx::Size InfoBubbleContentsView::GetPreferredSize() {
   gfx::Rect bounds = app_launcher_->browser()->window()->GetRestoredBounds();
-  return gfx::Size(bounds.width() * 2 / 3, bounds.width() * 4 / 5);
+  return gfx::Size(bounds.width() * 2 / 3, bounds.height() * 4 / 5);
 }
 
 void InfoBubbleContentsView::Layout() {
   if (bounds().IsEmpty() || GetChildViewCount() == 0)
     return;
 
+  gfx::Rect bounds = GetLocalBounds(false);
   int navigation_bar_height =
       kNavigationBarHeight + kNavigationEntryYMargin * 2;
   const views::Border* border = navigation_bar_->border();
   if (border) {
     gfx::Insets insets;
     border->GetInsets(&insets);
     navigation_bar_height += insets.height();
   }
-  navigation_bar_->SetBounds(x(), y(), width(), navigation_bar_height);
+  navigation_bar_->SetBounds(bounds.x(), bounds.y(),
+                             bounds.width(), navigation_bar_height);
   int render_y = navigation_bar_->bounds().bottom();
   gfx::Size rwhv_size =
-      gfx::Size(width(), std::max(0, height() - render_y + y()));
-  render_view_container_->SetBounds(x(), render_y,
+      gfx::Size(width(), std::max(0, bounds.height() - render_y + bounds.y()));
+  render_view_container_->SetBounds(bounds.x(), render_y,
                                     rwhv_size.width(), rwhv_size.height());
   app_launcher_->rwhv_->SetSize(rwhv_size);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppLauncher
 
 AppLauncher::AppLauncher(Browser* browser)
     : browser_(browser),
       info_bubble_(NULL),
@@ skipping 25 matching lines @@
   contents_rvh_->CreateRenderView(profile->GetRequestContext());
   DCHECK(contents_rvh_->IsRenderViewLive());
   contents_rvh_->NavigateToURL(GetMenuURL());
 }
 
 AppLauncher::~AppLauncher() {
   contents_rvh_->Shutdown();
 }
 
 // static
-AppLauncher* AppLauncher::Show(Browser* browser) {
+AppLauncher* AppLauncher::Show(Browser* browser, const gfx::Rect& bounds) {
   AppLauncher* app_launcher = new AppLauncher(browser);
-
   BrowserView* browser_view = static_cast<BrowserView*>(browser->window());
-  TabStrip* tabstrip = browser_view->tabstrip()->AsTabStrip();
-  if (!tabstrip) {
-    delete app_launcher;
-    return NULL;
-  }
-  gfx::Rect bounds = tabstrip->GetNewTabButtonBounds();
-  gfx::Point origin = bounds.origin();
-  views::RootView::ConvertPointToScreen(tabstrip, &origin);
-  bounds.set_origin(origin);
   app_launcher->info_bubble_ =
       InfoBubble::Show(browser_view->frame()->GetWindow(), bounds,
                        app_launcher->info_bubble_content_, app_launcher);
   app_launcher->info_bubble_content_->BubbleShown();
   return app_launcher;
 }
 
+// static
+AppLauncher* AppLauncher::ShowForNewTab(Browser* browser) {
+  BrowserView* browser_view = static_cast<BrowserView*>(browser->window());
+  TabStrip* tabstrip = browser_view->tabstrip()->AsTabStrip();
+  if (!tabstrip)
+    return NULL;
+  gfx::Rect bounds = tabstrip->GetNewTabButtonBounds();
+  gfx::Point origin = bounds.origin();
+  views::RootView::ConvertPointToScreen(tabstrip, &origin);
+  bounds.set_origin(origin);
+  return Show(browser, bounds);
+}
+
 void AppLauncher::Hide() {
   info_bubble_->Close();
 }
 
 void AppLauncher::InfoBubbleClosing(InfoBubble* info_bubble,
                                     bool closed_by_escape) {
   // The stack may have pending_contents_ on it. Delay deleting the
   // pending_contents_ as TabContents doesn't deal well with being deleted
   // while on the stack.
   MessageLoop::current()->PostTask(FROM_HERE,
@@ skipping 70 matching lines @@
     }
     case chromeos::StatusAreaView::OPEN_TABS_ON_RIGHT: {
       browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
       break;
     }
   }
 #else
   browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
 #endif
 }