Make popups closer to pixel-perfect. The main problem is that the toolbar is...

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2006-2008 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/toolbar_view.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/dom_view.h"
+#include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/views/theme_helpers.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/background.h"
 #include "chrome/views/button_dropdown.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/label.h"
 #include "chrome/views/tooltip_manager.h"
 #include "chrome/views/widget.h"
 #include "net/base/net_util.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
 static const int kControlHorizOffset = 4;
 static const int kControlVertOffset = 6;
-static const int kControlVertOffsetLocationOnly = 4;
-// The left and right margin of the toolbar in location-bar only mode.
-static const int kToolbarHorizontalMargin = 1;
 static const int kControlIndent = 3;
 static const int kStatusBubbleWidth = 480;
 
 // Separation between the location bar and the menus.
 static const int kMenuButtonOffset = 3;
 
 // Padding to the right of the location bar
 static const int kPaddingRight = 2;
 
 BrowserToolbarView::BrowserToolbarView(Browser* browser)
@@ skipping 248 matching lines @@
 
     sz = app_menu_->GetPreferredSize();
     right_side_width += sz.width() + kPaddingRight;
 
     sz = go_->GetPreferredSize();
     location_bar_height = sz.height();
     right_side_width += sz.width();
 
     left_side_width = star_->x() + star_->width();
   } else {
-    gfx::Size temp = location_bar_->GetPreferredSize();
-    location_bar_height = temp.height();
-    left_side_width = kToolbarHorizontalMargin;
-    right_side_width = kToolbarHorizontalMargin;
-    location_bar_y = kControlVertOffsetLocationOnly;
+    location_bar_height = location_bar_->GetPreferredSize().height();
+    location_bar_y = 0;
   }
 
   location_bar_->SetBounds(left_side_width, location_bar_y,
                            width() - left_side_width - right_side_width,
                            location_bar_height);
 
   if (IsDisplayModeNormal()) {
     go_->SetBounds(location_bar_->x() + location_bar_->width(),
                    kControlVertOffset, sz.width(), sz.height());
 
@@ skipping 140 matching lines @@
 gfx::Size BrowserToolbarView::GetPreferredSize() {
   if (IsDisplayModeNormal()) {
     static SkBitmap normal_background;
     if (normal_background.isNull()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
     return gfx::Size(0, normal_background.height());
   }
 
-  int locbar_height = location_bar_->GetPreferredSize().height();
-  return gfx::Size(0, locbar_height + 2 * kControlVertOffsetLocationOnly);
+  int client_edge_height =
+      (browser_->window() && !browser_->window()->IsMaximized()) ?
+      BrowserView::kClientEdgeThickness : 0;
+  return gfx::Size(0,
+      location_bar_->GetPreferredSize().height() + client_edge_height);
 }
 
 void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
 
   Menu menu(this, anchor, hwnd);
   menu.AppendMenuItemWithLabel(IDC_CREATE_SHORTCUTS,
       l10n_util::GetString(IDS_CREATE_SHORTCUTS));
@@ skipping 306 matching lines @@
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }