Rename apps::ShellWindow to apps::AppWindow

chrome/browser/ui/views/apps/native_app_window_views.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_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 
-#include "apps/shell_window.h"
+#include "apps/app_window.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration.h"
 #endif
 
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
 }
 #endif
 
 class ExtensionKeybindingRegistryViews;
 
 namespace apps {
-class ShellWindowFrameView;
+class AppWindowFrameView;
 }
 
 namespace content {
 class BrowserContext;
 class RenderViewHost;
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 }
 
 namespace ui {
 class MenuModel;
 }
 
 namespace views {
 class MenuRunner;
 class WebView;
 }
 
 class NativeAppWindowViews : public apps::NativeAppWindow,
                              public content::WebContentsObserver,
                              public views::ContextMenuController,
                              public views::WidgetDelegateView,
                              public views::WidgetObserver {
  public:
   NativeAppWindowViews();
   virtual ~NativeAppWindowViews();
-  void Init(apps::ShellWindow* shell_window,
-            const apps::ShellWindow::CreateParams& create_params);
+  void Init(apps::AppWindow* app_window,
+            const apps::AppWindow::CreateParams& create_params);
 
   SkRegion* shape() { return shape_.get(); }
 
  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);
 
   // ui::BaseWindow implementation that subclasses may override.
   virtual void Show() OVERRIDE;
   virtual void Activate() OVERRIDE;
 
   content::BrowserContext* browser_context() {
-    return shell_window_->browser_context();
+    return app_window_->browser_context();
   }
 
-  const extensions::Extension* extension() {
-    return shell_window_->extension();
-  }
+  const extensions::Extension* extension() { return app_window_->extension(); }
 
  private:
   friend class ShapedAppWindowTargeterTest;
 
   void InitializeDefaultWindow(
-      const apps::ShellWindow::CreateParams& create_params);
+      const apps::AppWindow::CreateParams& create_params);
   void InitializePanelWindow(
-      const apps::ShellWindow::CreateParams& create_params);
+      const apps::AppWindow::CreateParams& create_params);
   void OnViewWasResized();
 
   bool ShouldUseChromeStyleFrame() const;
 
   // Caller owns the returned object.
-  apps::ShellWindowFrameView* CreateShellWindowFrameView();
+  apps::AppWindowFrameView* CreateAppWindowFrameView();
 
 #if defined(OS_WIN)
   void OnShortcutInfoLoaded(
       const ShellIntegration::ShortcutInfo& shortcut_info);
   HWND GetNativeAppWindowHWND() const;
 #endif
 
   // ui::BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
@@ skipping 88 matching lines @@
 
   // web_modal::WebContentsModalDialogHost implementation.
   virtual gfx::NativeView GetHostView() const OVERRIDE;
   virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
   virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
   virtual void AddObserver(
       web_modal::ModalDialogHostObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
       web_modal::ModalDialogHostObserver* observer) OVERRIDE;
 
-  content::WebContents* web_contents() {
-    return shell_window_->web_contents();
-  }
+  content::WebContents* web_contents() { return app_window_->web_contents(); }
 
-  apps::ShellWindow* shell_window_; // weak - ShellWindow owns NativeAppWindow.
+  apps::AppWindow* app_window_;  // Not owned.
   views::WebView* web_view_;
   views::Widget* window_;
   bool is_fullscreen_;
 
   // Custom shape of the window. If this is not set then the window has a
   // default shape, usually rectangular.
   scoped_ptr<SkRegion> shape_;
 
   scoped_ptr<SkRegion> draggable_region_;
 
@@ skipping 20 matching lines @@
 
   base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_