Revert 250826 "Remove Profile dependency from apps::ShellWindow"

trunk/src/apps/app_shim/extension_app_shim_handler_mac.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/app_shim/extension_app_shim_handler_mac.h"
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/app_shim/app_shim_host_manager_mac.h"
 #include "apps/app_shim/app_shim_messages.h"
 #include "apps/launcher.h"
@@ skipping 212 matching lines @@
     const std::string& app_id) {
   HostMap::iterator it = hosts_.find(make_pair(profile, app_id));
   return it == hosts_.end() ? NULL : it->second;
 }
 
 // static
 void ExtensionAppShimHandler::QuitAppForWindow(ShellWindow* shell_window) {
   ExtensionAppShimHandler* handler =
       g_browser_process->platform_part()->app_shim_host_manager()->
           extension_app_shim_handler();
-  Host* host = handler->FindHost(
-      Profile::FromBrowserContext(shell_window->browser_context()),
-      shell_window->extension_id());
+  Host* host = handler->FindHost(shell_window->profile(),
+                                 shell_window->extension_id());
   if (host) {
     handler->OnShimQuit(host);
   } else {
     // App shims might be disabled or the shim is still starting up.
-    ShellWindowRegistry::Get(
-        Profile::FromBrowserContext(shell_window->browser_context()))
-        ->CloseAllShellWindowsForApp(shell_window->extension_id());
+    ShellWindowRegistry::Get(shell_window->profile())->
+        CloseAllShellWindowsForApp(shell_window->extension_id());
   }
 }
 
 void ExtensionAppShimHandler::HideAppForWindow(ShellWindow* shell_window) {
   ExtensionAppShimHandler* handler =
       g_browser_process->platform_part()->app_shim_host_manager()->
           extension_app_shim_handler();
-  Profile* profile =
-      Profile::FromBrowserContext(shell_window->browser_context());
+  Profile* profile = shell_window->profile();
   Host* host = handler->FindHost(profile, shell_window->extension_id());
   if (host)
     host->OnAppHide();
   else
     SetAppHidden(profile, shell_window->extension_id(), true);
 }
 
 
 void ExtensionAppShimHandler::FocusAppForWindow(ShellWindow* shell_window) {
   ExtensionAppShimHandler* handler =
       g_browser_process->platform_part()->app_shim_host_manager()->
           extension_app_shim_handler();
-  Profile* profile =
-      Profile::FromBrowserContext(shell_window->browser_context());
+  Profile* profile = shell_window->profile();
   const std::string& app_id = shell_window->extension_id();
   Host* host = handler->FindHost(profile, app_id);
   if (host) {
     handler->OnShimFocus(host,
                          APP_SHIM_FOCUS_NORMAL,
                          std::vector<base::FilePath>());
   } else {
     FocusWindows(
         apps::ShellWindowRegistry::Get(profile)->GetShellWindowsForApp(app_id));
   }
 }
 
 // static
 bool ExtensionAppShimHandler::RequestUserAttentionForWindow(
     ShellWindow* shell_window) {
   ExtensionAppShimHandler* handler =
       g_browser_process->platform_part()->app_shim_host_manager()->
           extension_app_shim_handler();
-  Profile* profile =
-      Profile::FromBrowserContext(shell_window->browser_context());
+  Profile* profile = shell_window->profile();
   Host* host = handler->FindHost(profile, shell_window->extension_id());
   if (host) {
     // Bring the window to the front without showing it.
     ShellWindowRegistry::Get(profile)->ShellWindowActivated(shell_window);
     host->OnAppRequestUserAttention();
     return true;
   } else {
     // Just show the app.
     SetAppHidden(profile, shell_window->extension_id(), false);
     return false;
@@ skipping 231 matching lines @@
   if (hosts_.empty())
     delegate_->MaybeTerminate();
 }
 
 void ExtensionAppShimHandler::OnAppStop(Profile* profile,
                                         const std::string& app_id) {}
 
 void ExtensionAppShimHandler::OnChromeTerminating() {}
 
 }  // namespace apps