Revert 251094 "Revert 250826 "Remove Profile dependency from app..."

trunk/src/chrome/browser/ui/apps/chrome_shell_window_delegate.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 "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/render_messages.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
 #if defined(USE_ASH)
 #include "ash/shelf/shelf_constants.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 
 namespace {
 
 bool disable_external_open_for_testing_ = false;
 
 // Opens a URL with Chromium (not external browser) with the right profile.
 content::WebContents* OpenURLFromTabInternal(
-    Profile* profile,
+    content::BrowserContext* context,
     content::WebContents* source,
     const content::OpenURLParams& params) {
   // Force all links to open in a new tab, even if they were trying to open a
   // window.
   chrome::NavigateParams new_tab_params(
       static_cast<Browser*>(NULL), params.url, params.transition);
   new_tab_params.disposition = params.disposition == NEW_BACKGROUND_TAB
                                    ? params.disposition
                                    : NEW_FOREGROUND_TAB;
-  new_tab_params.initiating_profile = profile;
+  new_tab_params.initiating_profile = Profile::FromBrowserContext(context);
   chrome::Navigate(&new_tab_params);
 
   return new_tab_params.target_contents;
 }
 
 // Helper class that opens a URL based on if this browser instance is the
 // default system browser. If it is the default, open the URL directly instead
 // of asking the system to open it.
 class OpenURLFromTabBasedOnBrowserDefault
     : public ShellIntegration::DefaultWebClientObserver {
@@ skipping 78 matching lines @@
 #endif  // defined(ENABLE_PRINTING)
 }
 
 apps::NativeAppWindow* ChromeShellWindowDelegate::CreateNativeAppWindow(
     apps::ShellWindow* window,
     const apps::ShellWindow::CreateParams& params) {
   return CreateNativeAppWindowImpl(window, params);
 }
 
 content::WebContents* ChromeShellWindowDelegate::OpenURLFromTab(
-    Profile* profile,
+    content::BrowserContext* context,
     content::WebContents* source,
     const content::OpenURLParams& params) {
-  return OpenURLFromTabInternal(profile, source, params);
+  return OpenURLFromTabInternal(context, source, params);
 }
 
 void ChromeShellWindowDelegate::AddNewContents(
-    Profile* profile,
+    content::BrowserContext* context,
     content::WebContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture,
     bool* was_blocked) {
   if (!disable_external_open_for_testing_) {
     if (!shell_window_link_delegate_.get())
       shell_window_link_delegate_.reset(new ShellWindowLinkDelegate());
     new_contents->SetDelegate(shell_window_link_delegate_.get());
     return;
   }
   chrome::ScopedTabbedBrowserDisplayer displayer(
-      profile, chrome::GetActiveDesktop());
+      Profile::FromBrowserContext(context), chrome::GetActiveDesktop());
   // Force all links to open in a new tab, even if they were trying to open a
   // new window.
   disposition =
       disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB;
   chrome::AddWebContents(displayer.browser(), NULL, new_contents, disposition,
                          initial_pos, user_gesture, was_blocked);
 }
 
 content::ColorChooser* ChromeShellWindowDelegate::ShowColorChooser(
     content::WebContents* web_contents,
@@ skipping 32 matching lines @@
   if (host) {
     host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(
         host->GetRoutingID(), blocked));
   }
 }
 
 bool ChromeShellWindowDelegate::IsWebContentsVisible(
     content::WebContents* web_contents) {
   return platform_util::IsVisible(web_contents->GetView()->GetNativeView());
 }