Location bar layout changes for M6 theme.

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 204 matching lines @@
 
 gfx::Size InfoBubbleContentsView::GetPreferredSize() {
   return preferred_size_;
 }
 
 void InfoBubbleContentsView::Layout() {
   if (bounds().IsEmpty() || GetChildViewCount() == 0)
     return;
 
   gfx::Rect bounds = GetLocalBounds(false);
-  // The browser's location bar use a vertical padding that we need to take into
+  // The browser's location bar uses vertical padding that we need to take into
   // account to match its height.
-  int location_bar_height =
-      location_bar_->GetPreferredSize().height() - LocationBarView::kVertMargin;
+  int location_bar_height = location_bar_->GetPreferredSize().height() -
+      LocationBarView::kVerticalEdgeThickness;
   location_bar_->SetBounds(bounds.x(), bounds.y(), bounds.width(),
                            location_bar_height);
   int render_y = location_bar_->bounds().bottom() + kNavigationBarBottomPadding;
   dom_view_->SetBounds(0, render_y,
                        width(), app_launcher_->contents_pref_size_.height());
 }
 
 void InfoBubbleContentsView::ExecuteCommand(int id) {
   // The user navigated by typing or selecting an entry in the location bar.
   DCHECK_EQ(IDC_OPEN_CURRENT_URL, id);
@@ skipping 149 matching lines @@
   browser_->AddTabWithURL(
       url, GURL(), transition, -1,
       TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX, NULL,
       std::string());
 }
 
 void AppLauncher::Resize(const gfx::Size& contents_size) {
   info_bubble_content_->ComputePreferredSize(contents_size);
   info_bubble_->SizeToContents();
 }