Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / app_launch_controller.cc

diff --git a/src/chrome/browser/chromeos/login/app_launch_controller.cc b/src/chrome/browser/chromeos/login/app_launch_controller.cc
index a277a58..32263f6 100644 (file)
--- a/src/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/src/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -4,8 +4,6 @@
 
 #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"
@@ -20,18 +18,21 @@
 #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/login_display_host.h"
-#include "chrome/browser/chromeos/login/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
-#include "chrome/browser/chromeos/login/webui_login_view.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 {
@@ -56,13 +57,14 @@ AppLaunchController::ReturnBoolCallback*
 // 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(
@@ -79,8 +81,8 @@ class AppLaunchController::AppWindowWatcher
   }
 
  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();
@@ -93,7 +95,7 @@ class AppLaunchController::AppWindowWatcher
 
   AppLaunchController* controller_;
   std::string app_id_;
-  apps::AppWindowRegistry* window_registry_;
+  extensions::AppWindowRegistry* window_registry_;
   base::WeakPtrFactory<AppWindowWatcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowWatcher);
@@ -296,7 +298,7 @@ bool AppLaunchController::CanConfigureNetwork() {
     return true;
   }
 
-  return !UserManager::Get()->GetOwnerEmail().empty();
+  return !user_manager::UserManager::Get()->GetOwnerEmail().empty();
 }
 
 bool AppLaunchController::NeedOwnerAuthToConfigureNetwork() {