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

apps/ui/views/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 APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "apps/size_constraints.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
@@ skipping 34 matching lines @@
 class NativeAppWindowViews : public NativeAppWindow,
                              public content::WebContentsObserver,
                              public views::WidgetDelegateView,
                              public views::WidgetObserver {
  public:
   NativeAppWindowViews();
   virtual ~NativeAppWindowViews();
   void Init(AppWindow* app_window,
             const AppWindow::CreateParams& create_params);
 
-  views::Widget* widget() { return widget_; }
-
   void set_window_for_testing(views::Widget* window) { widget_ = window; }
   void set_web_view_for_testing(views::WebView* view) { web_view_ = view; }
 
  protected:
   AppWindow* app_window() { return app_window_; }
   const AppWindow* app_window() const { return app_window_; }
 
+  views::Widget* widget() { return widget_; }
   const views::Widget* widget() const { return widget_; }
 
   views::WebView* web_view() { return web_view_; }
 
   // Initializes |widget_| for |app_window|.
   virtual void InitializeWindow(AppWindow* app_window,
                                 const AppWindow::CreateParams& create_params);
 
   // ui::BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
@@ skipping 109 matching lines @@
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
 }  // namespace apps
 
 #endif  // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_