Move AppWindow to extensions

chrome/browser/policy/policy_browsertest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 140 matching lines @@
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/screenshot_taker.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "ui/keyboard/keyboard_util.h"
 #endif
 
 #if !defined(OS_MACOSX)
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/extensions/application_launch.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 "ui/base/window_open_disposition.h"
 #endif
 
 using content::BrowserThread;
 using content::URLRequestMockHTTPJob;
 using testing::Mock;
 using testing::Return;
 using testing::_;
 
@@ skipping 357 matching lines @@
 }
 
 void WebContentsLoadedOrDestroyedWatcher::DidStopLoading(
     content::RenderViewHost* render_view_host) {
   message_loop_runner_->Quit();
 }
 
 #if !defined(OS_MACOSX)
 
 // Observer used to wait for the creation of a new app window.
-class TestAddAppWindowObserver : public apps::AppWindowRegistry::Observer {
+class TestAddAppWindowObserver
+    : public extensions::AppWindowRegistry::Observer {
  public:
-  explicit TestAddAppWindowObserver(apps::AppWindowRegistry* registry);
+  explicit TestAddAppWindowObserver(extensions::AppWindowRegistry* registry);
   virtual ~TestAddAppWindowObserver();
 
-  // apps::AppWindowRegistry::Observer:
-  virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
+  // extensions::AppWindowRegistry::Observer:
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE;
 
-  apps::AppWindow* WaitForAppWindow();
+  extensions::AppWindow* WaitForAppWindow();
 
  private:
-  apps::AppWindowRegistry* registry_;  // Not owned.
-  apps::AppWindow* window_;            // Not owned.
+  extensions::AppWindowRegistry* registry_;  // Not owned.
+  extensions::AppWindow* window_;            // Not owned.
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAddAppWindowObserver);
 };
 
 TestAddAppWindowObserver::TestAddAppWindowObserver(
-    apps::AppWindowRegistry* registry)
+    extensions::AppWindowRegistry* registry)
     : registry_(registry), window_(NULL) {
   registry_->AddObserver(this);
 }
 
 TestAddAppWindowObserver::~TestAddAppWindowObserver() {
   registry_->RemoveObserver(this);
 }
 
-void TestAddAppWindowObserver::OnAppWindowAdded(apps::AppWindow* app_window) {
+void TestAddAppWindowObserver::OnAppWindowAdded(
+    extensions::AppWindow* app_window) {
   window_ = app_window;
   run_loop_.Quit();
 }
 
-apps::AppWindow* TestAddAppWindowObserver::WaitForAppWindow() {
+extensions::AppWindow* TestAddAppWindowObserver::WaitForAppWindow() {
   run_loop_.Run();
   return window_;
 }
 
 #endif
 
 }  // namespace
 
 class PolicyTest : public InProcessBrowserTest {
  protected:
@@ skipping 1628 matching lines @@
                new base::FundamentalValue(false),
                NULL);
   UpdateProviderPolicy(policies);
 
   const extensions::Extension* extension =
       LoadUnpackedExtension(kUnpackedFullscreenAppName, true);
   ASSERT_TRUE(extension);
 
   // Launch an app that tries to open a fullscreen window.
   TestAddAppWindowObserver add_window_observer(
-      apps::AppWindowRegistry::Get(browser()->profile()));
+      extensions::AppWindowRegistry::Get(browser()->profile()));
   OpenApplication(AppLaunchParams(browser()->profile(),
                                   extension,
                                   extensions::LAUNCH_CONTAINER_NONE,
                                   NEW_WINDOW));
-  apps::AppWindow* window = add_window_observer.WaitForAppWindow();
+  extensions::AppWindow* window = add_window_observer.WaitForAppWindow();
   ASSERT_TRUE(window);
 
   // Verify that the window is not in fullscreen mode.
   EXPECT_FALSE(window->GetBaseWindow()->IsFullscreen());
 
   // Verify that the window cannot be toggled into fullscreen mode via apps
   // APIs.
   EXPECT_TRUE(content::ExecuteScript(
       window->web_contents(),
       "chrome.app.window.current().fullscreen();"));
@@ skipping 969 matching lines @@
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       browser2->tab_strip_model()->GetActiveWebContents(),
       "domAutomationController.send(window.showModalDialog !== undefined);",
       &result));
   EXPECT_TRUE(result);
 }
 
 #endif  // !defined(CHROME_OS)
 
 }  // namespace policy