Move AppWindow to extensions

chrome/browser/chromeos/login/app_launch_controller.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 "chrome/browser/chromeos/login/app_launch_controller.h"
 
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/oobe_display.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 #include "net/base/network_change_notifier.h"
 
 namespace chromeos {
 
 namespace {
 
 // Application install splash screen minimum show time in milliseconds.
 const int kAppInstallSplashScreenMinTimeMS = 3000;
 
 }  // namespace
 
 // static
 bool AppLaunchController::skip_splash_wait_ = false;
 int AppLaunchController::network_wait_time_ = 10;
 base::Closure* AppLaunchController::network_timeout_callback_ = NULL;
 AppLaunchController::ReturnBoolCallback*
     AppLaunchController::can_configure_network_callback_ = NULL;
 AppLaunchController::ReturnBoolCallback*
     AppLaunchController::need_owner_auth_to_configure_network_callback_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppLaunchController::AppWindowWatcher
 
 class AppLaunchController::AppWindowWatcher
-    : public apps::AppWindowRegistry::Observer {
+    : public extensions::AppWindowRegistry::Observer {
  public:
   explicit AppWindowWatcher(AppLaunchController* controller,
                             const std::string& app_id)
       : controller_(controller),
         app_id_(app_id),
-        window_registry_(apps::AppWindowRegistry::Get(controller->profile_)),
+        window_registry_(
+            extensions::AppWindowRegistry::Get(controller->profile_)),
         weak_factory_(this) {
     if (!window_registry_->GetAppWindowsForApp(app_id).empty()) {
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(&AppWindowWatcher::NotifyAppWindowCreated,
                      weak_factory_.GetWeakPtr()));
       return;
     } else {
       window_registry_->AddObserver(this);
     }
   }
   virtual ~AppWindowWatcher() {
     window_registry_->RemoveObserver(this);
   }
 
  private:
-  // apps::AppWindowRegistry::Observer overrides:
-  virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE {
+  // extensions::AppWindowRegistry::Observer overrides:
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE {
     if (app_window->extension_id() == app_id_) {
       window_registry_->RemoveObserver(this);
       NotifyAppWindowCreated();
     }
   }
 
   void NotifyAppWindowCreated() {
     controller_->OnAppWindowCreated();
   }
 
   AppLaunchController* controller_;
   std::string app_id_;
-  apps::AppWindowRegistry* window_registry_;
+  extensions::AppWindowRegistry* window_registry_;
   base::WeakPtrFactory<AppWindowWatcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowWatcher);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppLaunchController
 
 AppLaunchController::AppLaunchController(const std::string& app_id,
                                          bool diagnostic_mode,
@@ skipping 311 matching lines @@
   KioskAppLaunchError::Save(error);
   chrome::AttemptUserExit();
   CleanUp();
 }
 
 bool AppLaunchController::IsShowingNetworkConfigScreen() {
   return network_config_requested_;
 }
 
 }   // namespace chromeos