Move NativeAppWindow to extensions

chrome/browser/ui/ash/accelerator_commands_browsertest.cc

 // 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.
 
 #include "ash/accelerators/accelerator_commands.h"
 
 #include "apps/app_window.h"
-#include "apps/ui/native_app_window.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
+#include "extensions/browser/app_window/native_app_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 using testing::Combine;
 using testing::Values;
 using testing::WithParamInterface;
 
 namespace {
 
@@ skipping 243 matching lines @@
   const extensions::Extension* extension = LoadAndLaunchPlatformApp("minimal",
                                                                     "Launched");
 
   {
     // Test that ToggleFullscreen() toggles a platform's app's fullscreen
     // state and that it additionally puts the app into immersive fullscreen
     // if put_all_windows_in_immersive() returns true.
     apps::AppWindow::CreateParams params;
     params.frame = apps::AppWindow::FRAME_CHROME;
     apps::AppWindow* app_window = CreateAppWindowFromParams(extension, params);
-    apps::NativeAppWindow* native_app_window = app_window->GetBaseWindow();
+    extensions::NativeAppWindow* native_app_window =
+        app_window->GetBaseWindow();
     SetToInitialShowState(app_window);
     ASSERT_TRUE(app_window->GetBaseWindow()->IsActive());
     EXPECT_TRUE(IsInitialShowState(app_window));
 
     ash::accelerators::ToggleFullscreen();
     EXPECT_TRUE(native_app_window->IsFullscreen());
     ash::wm::WindowState* window_state =
         ash::wm::GetWindowState(native_app_window->GetNativeWindow());
     EXPECT_TRUE(IsInImmersiveFullscreen(window_state));
 
     ash::accelerators::ToggleFullscreen();
     EXPECT_TRUE(IsInitialShowState(app_window));
 
     CloseAppWindow(app_window);
   }
 
   {
     // Repeat the test, but make sure that frameless platform apps are never put
     // into immersive fullscreen.
     apps::AppWindow::CreateParams params;
     params.frame = apps::AppWindow::FRAME_NONE;
     apps::AppWindow* app_window = CreateAppWindowFromParams(extension, params);
-    apps::NativeAppWindow* native_app_window = app_window->GetBaseWindow();
+    extensions::NativeAppWindow* native_app_window =
+        app_window->GetBaseWindow();
     ASSERT_TRUE(app_window->GetBaseWindow()->IsActive());
     SetToInitialShowState(app_window);
     EXPECT_TRUE(IsInitialShowState(app_window));
 
     ash::accelerators::ToggleFullscreen();
     EXPECT_TRUE(native_app_window->IsFullscreen());
     ash::wm::WindowState* window_state =
         ash::wm::GetWindowState(native_app_window->GetNativeWindow());
     EXPECT_FALSE(IsInImmersiveFullscreen(window_state));
 
     ash::accelerators::ToggleFullscreen();
     EXPECT_TRUE(IsInitialShowState(app_window));
 
     CloseAppWindow(app_window);
   }
 }
 
 INSTANTIATE_TEST_CASE_P(InitiallyRestored,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Values(ui::SHOW_STATE_NORMAL));
 INSTANTIATE_TEST_CASE_P(InitiallyMaximized,
                         AcceleratorCommandsPlatformAppFullscreenBrowserTest,
                         Values(ui::SHOW_STATE_MAXIMIZED));