Move AppWindow to extensions

chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

 // Copyright 2014 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/ui/ash/launcher/app_window_launcher_controller.h"
 
-#include "apps/app_window.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "extensions/browser/app_window/app_window.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/wm/public/activation_client.h"
 
-using apps::AppWindow;
+using extensions::AppWindow;
+using extensions::AppWindowRegistry;
 
 namespace {
 
 std::string GetAppShelfId(AppWindow* app_window) {
   if (app_window->window_type_is_panel())
     return base::StringPrintf("panel:%d", app_window->session_id().id());
   return app_window->extension_id();
 }
 
 bool ControlsWindow(aura::Window* window) {
   return chrome::GetHostDesktopTypeForNativeWindow(window) ==
          chrome::HOST_DESKTOP_TYPE_ASH;
 }
 
 }  // namespace
 
 AppWindowLauncherController::AppWindowLauncherController(
     ChromeLauncherController* owner)
     : owner_(owner), activation_client_(NULL) {
-  apps::AppWindowRegistry* registry =
-      apps::AppWindowRegistry::Get(owner->profile());
+AppWindowRegistry* registry = AppWindowRegistry::Get(owner->profile());
   registry_.insert(registry);
   registry->AddObserver(this);
   if (ash::Shell::HasInstance()) {
     if (ash::Shell::GetInstance()->GetPrimaryRootWindow()) {
       activation_client_ = aura::client::GetActivationClient(
           ash::Shell::GetInstance()->GetPrimaryRootWindow());
       if (activation_client_)
         activation_client_->AddObserver(this);
     }
   }
 }
 
 AppWindowLauncherController::~AppWindowLauncherController() {
-  for (std::set<apps::AppWindowRegistry*>::iterator it = registry_.begin();
+  for (std::set<AppWindowRegistry*>::iterator it = registry_.begin();
        it != registry_.end();
        ++it)
     (*it)->RemoveObserver(this);
 
   if (activation_client_)
     activation_client_->RemoveObserver(this);
   for (WindowToAppShelfIdMap::iterator iter =
            window_to_app_shelf_id_map_.begin();
        iter != window_to_app_shelf_id_map_.end();
        ++iter) {
     iter->first->RemoveObserver(this);
   }
 }
 
 void AppWindowLauncherController::AdditionalUserAddedToSession(
     Profile* profile) {
   // TODO(skuhne): This was added for the legacy side by side mode in M32. If
   // this mode gets no longer pursued this special case can be removed.
   if (chrome::MultiUserWindowManager::GetMultiProfileMode() !=
       chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_MIXED)
     return;
 
-  apps::AppWindowRegistry* registry = apps::AppWindowRegistry::Get(profile);
+  AppWindowRegistry* registry = AppWindowRegistry::Get(profile);
   if (registry_.find(registry) != registry_.end())
     return;
 
   registry->AddObserver(this);
   registry_.insert(registry);
 }
 
 void AppWindowLauncherController::OnAppWindowIconChanged(
     AppWindow* app_window) {
   if (!ControlsWindow(app_window->GetNativeWindow()))
@@ skipping 137 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return NULL;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }