Componentize NativeAppWindowViews

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 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 "apps/ui/views/native_app_window_views.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "components/native_app_window/native_app_window_views.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 575 matching lines @@
   ASSERT_TRUE(window);
 
   // Gets the original width of the app window.
   int original_width;
   EXPECT_TRUE(content::ExecuteScriptAndExtractInt(
       window->web_contents(),
       "window.domAutomationController.setAutomationId(0);"
       "window.domAutomationController.send(window.innerWidth);",
       &original_width));
 
-  apps::NativeAppWindowViews* native_app_window_views =
-      static_cast<apps::NativeAppWindowViews*>(window->GetBaseWindow());
+  native_app_window::NativeAppWindowViews* native_app_window_views =
+      static_cast<native_app_window::NativeAppWindowViews*>(
+          window->GetBaseWindow());
   ui::AcceleratorTarget* accelerator_target =
       static_cast<ui::AcceleratorTarget*>(native_app_window_views);
 
   // Zoom in. Text is bigger and content window width becomes smaller.
   accelerator_target->AcceleratorPressed(ui::Accelerator(
       ui::VKEY_ADD, ui::EF_CONTROL_DOWN));
   int width_zoomed_in;
   EXPECT_TRUE(content::ExecuteScriptAndExtractInt(
       window->web_contents(),
       "window.domAutomationController.setAutomationId(0);"
@@ skipping 1114 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos