Componentize NativeAppWindowViews

chrome/browser/ui/views/apps/chrome_native_app_window_views.h

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.h
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
index f11075502c2ec6a913ad2600b2bab6f2b185f053..f5d63359bde637e72e2ff117eafaa47efb820555 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
@@ -5,10 +5,14 @@
 #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 "components/native_app_window/native_app_window_views.h"
 #include "ui/views/context_menu_controller.h"
 
+namespace apps {
+class AppWindowFrameView;
+}
+
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
@@ -21,8 +25,9 @@ namespace views {
 class MenuRunner;
 }
 
-class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews,
-                                   public views::ContextMenuController {
+class ChromeNativeAppWindowViews
+    : public native_app_window::NativeAppWindowViews,
+      public views::ContextMenuController {
  public:
   ChromeNativeAppWindowViews();
   virtual ~ChromeNativeAppWindowViews();