Fix opaque frame app mode windows to have correct toolbar/content separator.

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

 // Copyright (c) 2012 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_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 66 matching lines @@
   gfx::Size GetBrowserViewMinimumSize() const override;
   bool ShouldShowCaptionButtons() const override;
   bool ShouldShowAvatar() const override;
   bool IsRegularOrGuestSession() const override;
   gfx::ImageSkia GetOTRAvatarIcon() const override;
   bool IsMaximized() const override;
   bool IsMinimized() const override;
   bool IsFullscreen() const override;
   bool IsTabStripVisible() const override;
   int GetTabStripHeight() const override;
+  bool IsToolbarVisible() const override;
   gfx::Size GetTabstripPreferredSize() const override;
 
  protected:
   views::ImageButton* minimize_button() const { return minimize_button_; }
   views::ImageButton* maximize_button() const { return maximize_button_; }
   views::ImageButton* restore_button() const { return restore_button_; }
   views::ImageButton* close_button() const { return close_button_; }
 
   // views::View:
   void OnPaint(gfx::Canvas* canvas) override;
@@ skipping 38 matching lines @@
 
   // Returns true if the view should draw its own custom title bar.
   bool ShouldShowWindowTitleBar() const;
 
   // Paint various sub-components of this view.  The *FrameBorder() functions
   // also paint the background of the titlebar area, since the top frame border
   // and titlebar background are a contiguous component.
   void PaintRestoredFrameBorder(gfx::Canvas* canvas);
   void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
   void PaintToolbarBackground(gfx::Canvas* canvas);
-  void PaintRestoredClientEdge(gfx::Canvas* canvas);
-
-  // Returns the bounds of the client area for the specified view size.
-  gfx::Rect CalculateClientAreaBounds(int width, int height) const;
+  void PaintClientEdge(gfx::Canvas* canvas);
 
   // Our layout manager also calculates various bounds.
   OpaqueBrowserFrameViewLayout* layout_;
 
   // Window controls.
   views::ImageButton* minimize_button_;
   views::ImageButton* maximize_button_;
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
   // The window icon and title.
   TabIconView* window_icon_;
   views::Label* window_title_;
 
   // Background painter for the window frame.
   scoped_ptr<views::FrameBackground> frame_background_;
 
   // Observer that handles platform dependent configuration.
   scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_