Componentize NativeAppWindowViews

components/native_app_window/native_app_window_views.h

Index: components/native_app_window/native_app_window_views.h
diff --git a/apps/ui/views/native_app_window_views.h b/components/native_app_window/native_app_window_views.h
similarity index 89%
rename from apps/ui/views/native_app_window_views.h
rename to components/native_app_window/native_app_window_views.h
index 931faba211d476acf929c0e87b7338fdf4357388..c69c98150a6cb0cf8110ab5eb16a15c5c22dc845 100644
--- a/apps/ui/views/native_app_window_views.h
+++ b/components/native_app_window/native_app_window_views.h
@@ -2,8 +2,8 @@
 // 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_
+#ifndef COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_
+#define COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "base/observer_list.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -37,9 +37,7 @@ class MenuRunner;
 class WebView;
 }
 
-namespace apps {
-
-class AppWindowFrameView;
+namespace extensions {
 
 // A NativeAppWindow backed by a views::Widget. This class may be used alone
 // as a stub or subclassed (for example, ChromeNativeAppWindowViews).
@@ -50,8 +48,8 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
  public:
   NativeAppWindowViews();
   virtual ~NativeAppWindowViews();
-  void Init(extensions::AppWindow* app_window,
-            const extensions::AppWindow::CreateParams& create_params);
+  void Init(AppWindow* app_window,
+            const AppWindow::CreateParams& create_params);
 
   // Signal that CanHaveTransparentBackground has changed.
   void OnCanHaveAlphaEnabledChanged();
@@ -62,8 +60,8 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   void set_web_view_for_testing(views::WebView* view) { web_view_ = view; }
 
  protected:
-  extensions::AppWindow* app_window() { return app_window_; }
-  const extensions::AppWindow* app_window() const { return app_window_; }
+  AppWindow* app_window() { return app_window_; }
+  const AppWindow* app_window() const { return app_window_; }
 
   const views::Widget* widget() const { return widget_; }
 
@@ -71,8 +69,8 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
 
   // Initializes |widget_| for |app_window|.
   virtual void InitializeWindow(
-      extensions::AppWindow* app_window,
-      const extensions::AppWindow::CreateParams& create_params);
+      AppWindow* app_window,
+      const AppWindow::CreateParams& create_params);
 
   // ui::BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
@@ -143,7 +141,7 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   virtual void UpdateWindowTitle() OVERRIDE;
   virtual void UpdateBadgeIcon() OVERRIDE;
   virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
+      const std::vector<DraggableRegion>& regions) OVERRIDE;
   virtual SkRegion* GetDraggableRegion() OVERRIDE;
   virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
   virtual void HandleKeyboardEvent(
@@ -176,7 +174,7 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   // Informs modal dialogs that they need to update their positions.
   void OnViewWasResized();
 
-  extensions::AppWindow* app_window_;  // Not owned.
+  AppWindow* app_window_;  // Not owned.
   views::WebView* web_view_;
   views::Widget* widget_;
 
@@ -184,7 +182,7 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
 
   bool frameless_;
   bool resizable_;
-  extensions::SizeConstraints size_constraints_;
+  SizeConstraints size_constraints_;
 
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
@@ -193,6 +191,6 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
-}  // namespace apps
+}  // namespace extensions
 
-#endif  // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
+#endif  // COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_