Revert 262516 "Remove title and icon from chrome apps native style title bars."

apps/ui/views/app_window_frame_view.h

 // Copyright 2014 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 APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_
 #define APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_
 
 #include <string>
 
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 22 matching lines @@
 namespace apps {
 
 class NativeAppWindow;
 
 // A frameless or non-Ash, non-panel NonClientFrameView for app windows.
 class AppWindowFrameView : public views::NonClientFrameView,
                            public views::ButtonListener {
  public:
   static const char kViewClassName[];
 
-  // AppWindowFrameView is used to draw frames for app windows when a non
-  // standard frame is needed. This occurs if there is no frame needed, or if
-  // there is a frame color.
-  // If |draw_frame| is true, the view draws its own window title area and
-  // controls, using |frame_color|. If |draw_frame| is not true, no frame is
-  // drawn.
-  // TODO(benwells): Refactor this to split out frameless and colored frame
-  // views. See http://crbug.com/359432.
-  AppWindowFrameView(views::Widget* widget,
-                     NativeAppWindow* window,
-                     bool draw_frame,
-                     const SkColor& frame_color);
+  explicit AppWindowFrameView();
   virtual ~AppWindowFrameView();
 
-  void Init();
-
-  void SetResizeSizes(int resize_inside_bounds_size,
-                      int resize_outside_bounds_size,
-                      int resize_area_corner_size);
-  int resize_inside_bounds_size() const {
-    return resize_inside_bounds_size_;
-  };
+  // Initializes this for |widget|. Sets the number of pixels for which a click
+  // is interpreted as a resize for the inner and outer border of the window
+  // and the lower-right corner resize handle. If |draw_frame|, the view draws
+  // its own window title area and controls, using |frame_color| (otherwise
+  // |frame_color| is ignored).
+  void Init(views::Widget* widget,
+            NativeAppWindow* window,
+            bool draw_frame,
+            const SkColor& frame_color,
+            int resize_inside_bounds_size,
+            int resize_outside_bounds_size,
+            int resize_outside_scale_for_touch,
+            int resize_area_corner_size);
 
  private:
   // views::NonClientFrameView implementation.
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const OVERRIDE;
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE {}
@@ skipping 29 matching lines @@
 
   // Size in pixels of the lower-right corner resize handle.
   int resize_area_corner_size_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowFrameView);
 };
 
 }  // namespace apps
 
 #endif  // APPS_UI_VIEWS_APP_WINDOW_FRAME_VIEW_H_