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

chrome/browser/ui/views/apps/chrome_native_app_window_views.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 CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "apps/ui/views/native_app_window_views.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/views/context_menu_controller.h"
@@ skipping 21 matching lines @@
  protected:
   // Called before views::Widget::Init() to allow subclasses to customize
   // the InitParams that would be passed.
   virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
                                   views::Widget* widget);
 
   virtual void InitializeDefaultWindow(
       const apps::AppWindow::CreateParams& create_params);
   virtual void InitializePanelWindow(
       const apps::AppWindow::CreateParams& create_params);
-  virtual views::NonClientFrameView* CreateStandardDesktopAppFrame();
-  virtual apps::AppWindowFrameView* CreateNonStandardAppFrame();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
                            ResizeInsetsWithinBounds);
 
+  // Installs an EasyResizeWindowTargeter on the containing window, which
+  // allows the window to be resized from within |kResizeInsideBoundsSize|
+  // pixels inside the window bounds.
+  void InstallEasyResizeTargeterOnContainer() const;
+
+  // Caller owns the returned object.
+  apps::AppWindowFrameView* CreateAppWindowFrameView();
+
   // ui::BaseWindow implementation.
   virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
   virtual bool IsAlwaysOnTop() const OVERRIDE;
 
   // Overridden from views::ContextMenuController:
   virtual void ShowContextMenuForView(views::View* source,
                                       const gfx::Point& p,
                                       ui::MenuSourceType source_type) OVERRIDE;
 
   // WidgetDelegate implementation.
@@ skipping 45 matching lines @@
       immersive_fullscreen_controller_;
 #endif  // defined(USE_ASH)
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_