Fix a small, subtle problem that caused an interactive_ui_test failure....

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"
@@ skipping 461 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());
   }
 
+  // Note: We make sure to return the same value in the "no browser window" case
+  // as the "not maximized" case, so that when a popup is opened at a particular
+  // requested size, we'll report the same preferred size during the initial
+  // window size calculation (when there isn't yet a browser window) as when
+  // we're actually laying things out after setting up the browser window.  This
+  // prevents the content area from being off by |kClientEdgeThickness| px.
   int client_edge_height =
-      (browser_->window() && !browser_->window()->IsMaximized()) ?
-      BrowserView::kClientEdgeThickness : 0;
+      (browser_->window() && browser_->window()->IsMaximized()) ?
+      0 : BrowserView::kClientEdgeThickness;
   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);
@@ skipping 308 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);
 }