Componentize NativeAppWindowViews

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 "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;
 }
 #endif
 
 class ExtensionKeybindingRegistryViews;
 
 namespace views {
 class MenuRunner;
 }
 
-class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews,
+class ChromeNativeAppWindowViews : public extensions::NativeAppWindowViews,
                                    public views::ContextMenuController {
  public:
   ChromeNativeAppWindowViews();
   virtual ~ChromeNativeAppWindowViews();
 
   SkRegion* shape() { return shape_.get(); }
 
  protected:
   // Called before views::Widget::Init() to allow subclasses to customize
   // the InitParams that would be passed.
@@ skipping 72 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_