Introduce AppsClient and use it in apps to get the loaded profiles list.

apps/shell_window_registry.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 "apps/apps_client.h"
 #include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
-#include "chrome/browser/profiles/profile_manager.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"

[tapted, 2013/09/04 01:08:35]

nit: #include content/public/browser/browser_context.h?

[benwells, 2013/09/10 16:48:50]

Done.

 #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"
 
 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
@@ skipping 14 matching lines @@
   std::string key = shell_window->extension()->id();
   key += ':';
   key += shell_window->window_key();
   return key;
 }
 
 }  // namespace
 
 namespace apps {
 
-ShellWindowRegistry::ShellWindowRegistry(Profile* profile)
-    : profile_(profile),
+ShellWindowRegistry::ShellWindowRegistry(content::BrowserContext* context)
+    : context_(context),
       devtools_callback_(base::Bind(
           &ShellWindowRegistry::OnDevToolsStateChanged,
           base::Unretained(this))) {
   content::DevToolsManager::GetInstance()->AddAgentStateCallback(
       devtools_callback_);
 }
 
 ShellWindowRegistry::~ShellWindowRegistry() {
   content::DevToolsManager::GetInstance()->RemoveAgentStateCallback(
       devtools_callback_);
 }
 
 // static
-ShellWindowRegistry* ShellWindowRegistry::Get(Profile* profile) {
-  return Factory::GetForProfile(profile, true /* create */);
+ShellWindowRegistry* ShellWindowRegistry::Get(
+    content::BrowserContext* context) {
+  return Factory::GetForBrowserContext(context, true /* create */);
 }
 
 void ShellWindowRegistry::AddShellWindow(ShellWindow* shell_window) {
   BringToFront(shell_window);
   FOR_EACH_OBSERVER(Observer, observers_, OnShellWindowAdded(shell_window));
 }
 
 void ShellWindowRegistry::ShellWindowIconChanged(ShellWindow* shell_window) {
   AddShellWindowToList(shell_window);
   FOR_EACH_OBSERVER(Observer, observers_,
@@ skipping 96 matching lines @@
 
 bool ShellWindowRegistry::HadDevToolsAttached(
     content::RenderViewHost* render_view_host) const {
   std::string key = GetWindowKeyForRenderViewHost(this, render_view_host);
   return key.empty() ? false : inspected_windows_.count(key) != 0;
 }
 
 // static
 ShellWindow* ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(
     gfx::NativeWindow window) {
-  std::vector<Profile*> profiles =
-      g_browser_process->profile_manager()->GetLoadedProfiles();
-  for (std::vector<Profile*>::const_iterator i = profiles.begin();
-       i != profiles.end(); ++i) {
-    ShellWindowRegistry* registry = Factory::GetForProfile(*i,
-                                                           false /* create */);
+  std::vector<content::BrowserContext*> contexts =
+      AppsClient::Get()->GetLoadedBrowserContexts();
+  for (std::vector<content::BrowserContext*>::const_iterator i =
+           contexts.begin();
+       i != contexts.end(); ++i) {
+    ShellWindowRegistry* registry = Factory::GetForBrowserContext(
+        *i, false /* create */);
     if (!registry)
       continue;
 
     ShellWindow* shell_window = registry->GetShellWindowForNativeWindow(window);
     if (shell_window)
       return shell_window;
   }
 
   return NULL;
 }
 
 // static
 bool ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(
     int window_type_mask) {
-  std::vector<Profile*> profiles =
-      g_browser_process->profile_manager()->GetLoadedProfiles();
-  for (std::vector<Profile*>::const_iterator i = profiles.begin();
-       i != profiles.end(); ++i) {
-    ShellWindowRegistry* registry = Factory::GetForProfile(*i,
-                                                           false /* create */);
+  std::vector<content::BrowserContext*> contexts =
+      AppsClient::Get()->GetLoadedBrowserContexts();
+  for (std::vector<content::BrowserContext*>::const_iterator i =
+           contexts.begin();
+       i != contexts.end(); ++i) {
+    ShellWindowRegistry* registry = Factory::GetForBrowserContext(
+        *i, false /* create */);
     if (!registry)
       continue;
 
     const ShellWindowList& shell_windows = registry->shell_windows();
     if (shell_windows.empty())
       continue;
 
     if (window_type_mask == 0)
       return true;
 
     for (const_iterator j = shell_windows.begin(); j != shell_windows.end();
          ++j) {
       if ((*j)->window_type() & window_type_mask)
         return true;
     }
   }
 
   return false;
 }
 
 void ShellWindowRegistry::OnDevToolsStateChanged(
     content::DevToolsAgentHost* agent_host, bool attached) {
   content::RenderViewHost* rvh = agent_host->GetRenderViewHost();
   // Ignore unrelated notifications.
   if (!rvh ||
-      rvh->GetSiteInstance()->GetProcess()->GetBrowserContext() != profile_)
+      rvh->GetSiteInstance()->GetProcess()->GetBrowserContext() != context_)
     return;

[tapted, 2013/09/04 01:08:35]

nit (while you're here): blank line after early return?

[benwells, 2013/09/10 16:48:50]

Done.

   std::string key = GetWindowKeyForRenderViewHost(this, rvh);
   if (key.empty())
     return;
 
   if (attached)
     inspected_windows_.insert(key);
   else
     inspected_windows_.erase(key);
 }
 
@@ skipping 12 matching lines @@
                                                  shell_window);
   if (it != shell_windows_.end())
     shell_windows_.erase(it);
   shell_windows_.push_front(shell_window);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Factory boilerplate
 
 // static
-ShellWindowRegistry* ShellWindowRegistry::Factory::GetForProfile(
-    Profile* profile, bool create) {
+ShellWindowRegistry* ShellWindowRegistry::Factory::GetForBrowserContext(
+    content::BrowserContext* context, bool create) {
   return static_cast<ShellWindowRegistry*>(
-      GetInstance()->GetServiceForBrowserContext(profile, create));
+      GetInstance()->GetServiceForBrowserContext(context, create));
 }
 
 ShellWindowRegistry::Factory* ShellWindowRegistry::Factory::GetInstance() {
   return Singleton<ShellWindowRegistry::Factory>::get();
 }
 
 ShellWindowRegistry::Factory::Factory()
     : BrowserContextKeyedServiceFactory(
         "ShellWindowRegistry",
         BrowserContextDependencyManager::GetInstance()) {
 }
 
 ShellWindowRegistry::Factory::~Factory() {
 }
 
 BrowserContextKeyedService*
 ShellWindowRegistry::Factory::BuildServiceInstanceFor(
-    content::BrowserContext* profile) const {
-  return new ShellWindowRegistry(static_cast<Profile*>(profile));
+    content::BrowserContext* context) const {
+  return new ShellWindowRegistry(context);
 }
 
 bool ShellWindowRegistry::Factory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 }  // namespace extensions