Move AppWindow to extensions

extensions/browser/app_window/app_window_registry.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 "apps/app_window_registry.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 
 #include <string>
 #include <vector>
 
-#include "apps/app_window.h"
-#include "apps/ui/apps_client.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/apps_client.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 
+namespace extensions {
+
 namespace {
 
 // Create a key that identifies a AppWindow in a RenderViewHost across App
 // reloads. If the window was given an id in CreateParams, the key is the
 // extension id, a colon separator, and the AppWindow's |id|. If there is no
 // |id|, the chrome-extension://extension-id/page.html URL will be used. If the
 // RenderViewHost is not for a AppWindow, return an empty string.
 std::string GetWindowKeyForRenderViewHost(
-    const apps::AppWindowRegistry* registry,
+    const AppWindowRegistry* registry,
     content::RenderViewHost* render_view_host) {
-  apps::AppWindow* app_window =
+  AppWindow* app_window =
       registry->GetAppWindowForRenderViewHost(render_view_host);
   if (!app_window)
     return std::string();  // Not a AppWindow.
 
   if (app_window->window_key().empty())
     return app_window->web_contents()->GetURL().possibly_invalid_spec();
 
   std::string key = app_window->extension_id();
   key += ':';
   key += app_window->window_key();
   return key;
 }
 
 }  // namespace
 
-namespace apps {
-
 void AppWindowRegistry::Observer::OnAppWindowAdded(AppWindow* app_window) {
 }
 
 void AppWindowRegistry::Observer::OnAppWindowIconChanged(
     AppWindow* app_window) {
 }
 
 void AppWindowRegistry::Observer::OnAppWindowRemoved(AppWindow* app_window) {
 }
 
@@ skipping 278 matching lines @@
 bool AppWindowRegistry::Factory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool AppWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return extensions::ExtensionsBrowserClient::Get()->GetOriginalContext(
-      context);
+  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 }
 
-}  // namespace apps
+}  // namespace extensions