Move ShellWindow into apps component.

chrome/browser/extensions/shell_window_registry.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 "apps/shell_window.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_manager.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"
 
+using apps::ShellWindow;
+
 namespace {
 
 // Create a key that identifies a ShellWindow 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 ShellWindow'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 ShellWindow, return an empty string.
 std::string GetWindowKeyForRenderViewHost(
     const extensions::ShellWindowRegistry* registry,
     content::RenderViewHost* render_view_host) {
   ShellWindow* shell_window =
       registry->GetShellWindowForRenderViewHost(render_view_host);
   if (!shell_window)
     return std::string(); // Not a ShellWindow.
 
   if (shell_window->window_key().empty())
     return shell_window->web_contents()->GetURL().possibly_invalid_spec();
 
   std::string key = shell_window->extension()->id();
   key += ':';
   key += shell_window->window_key();
   return key;
 }
 
-}
+}  // namespace
 
 namespace extensions {
 
 ShellWindowRegistry::ShellWindowRegistry(Profile* profile)
     : profile_(profile),
       devtools_callback_(base::Bind(
           &ShellWindowRegistry::OnDevToolsStateChanged,
           base::Unretained(this))) {
   content::DevToolsManager::GetInstance()->AddAgentStateCallback(
       devtools_callback_);
@@ skipping 230 matching lines @@
 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 }  // namespace extensions