Misc. small changes in preparation for moving popup mode edge drawing.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/ui/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 65 matching lines @@
 
 #if defined(OS_WIN)
 #include "chrome/browser/recovery/recovery_install_global_error_factory.h"
 #include "chrome/browser/ui/views/conflicting_module_view_win.h"
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/signin_global_error_factory.h"
 #include "chrome/browser/sync/sync_global_error_factory.h"
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 namespace {
@@ skipping 596 matching lines @@
 #if defined(OS_WIN)
       ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
 #endif
     }
     incompatibility_badge_showing = true;
     return;
   }
 }
 
 int ToolbarView::PopupTopSpacing() const {
-  const int kAdditionalPopupTopSpacingNonGlass = 2;
+#if defined(OS_CHROMEOS)
+  return views::NonClientFrameView::kClientEdgeThickness;
+#else
   return views::NonClientFrameView::kClientEdgeThickness +
       (GetWidget()->ShouldWindowContentsBeTransparent() ?
-          0 : kAdditionalPopupTopSpacingNonGlass);
+          0 : OpaqueBrowserFrameView::kContentEdgeShadowThickness);
+#endif
 }
 
 gfx::Size ToolbarView::GetSizeInternal(
     gfx::Size (View::*get_size)() const) const {
   gfx::Size size((location_bar_->*get_size)());
   if (is_display_mode_normal()) {
     const int element_padding = GetLayoutConstant(TOOLBAR_ELEMENT_PADDING);
     const int browser_actions_width =
         (browser_actions_->*get_size)().width();
     const int right_padding =
@@ skipping 106 matching lines @@
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return GetLayoutConstant(
       (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
           TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
 }