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

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/window/frame_buttons.h"
 
 class AvatarMenuButton;
 class NewAvatarButton;
 class OpaqueBrowserFrameViewLayoutDelegate;
 
 namespace views {
 class ImageButton;
 class Label;
 }
 
 // Calculates the position of the widgets in the opaque browser frame view.
 //
 // This is separated out for testing reasons. OpaqueBrowserFrameView has tight
 // dependencies with Browser and classes that depend on Browser.
 class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
  public:
+  // Constants used by OpaqueBrowserFrameView as well.
+  static const int kContentEdgeShadowThickness;
+
   // Constants public for testing only.
   static const int kNonClientRestoredExtraThickness;
   static const int kFrameBorderThickness;
-  static const int kTitlebarTopAndBottomEdgeThickness;
+  static const int kTitlebarTopEdgeThickness;
   static const int kIconLeftSpacing;
   static const int kIconTitleSpacing;
   static const int kCaptionSpacing;
   static const int kNewTabCaptionCondensedSpacing;
 
   explicit OpaqueBrowserFrameViewLayout(
       OpaqueBrowserFrameViewLayoutDelegate* delegate);
   ~OpaqueBrowserFrameViewLayout() override;
 
   // Whether we should add the (minimize,maximize,close) buttons. This should be
@@ skipping 152 matching lines @@
   AvatarMenuButton* avatar_button_;
   views::View* new_avatar_button_;
 
   std::vector<views::FrameButton> leading_buttons_;
   std::vector<views::FrameButton> trailing_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_