[Extensions] Remove ChromeExtensionFunctionDetails::GetOriginWebContents

chrome/browser/extensions/api/media_galleries/media_galleries_api.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.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <stddef.h>
 
@@ skipping 23 matching lines @@
 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
 #include "chrome/browser/media_galleries/media_galleries_permission_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/extensions/api/media_galleries.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/storage_monitor/storage_info.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/blob_handle.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/blob_holder.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/media_galleries_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "net/base/mime_sniffer.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 193 matching lines @@
   friend class base::RefCounted<SelectDirectoryDialog>;
   ~SelectDirectoryDialog() override {}
 
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
   WebContents* web_contents_;
   Callback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectDirectoryDialog);
 };
 
+// Returns a web contents to use as the source for a prompt showing to the user.
+// The web contents has to support modal dialogs, so it can't be the app's
+// background page.
+content::WebContents* GetWebContentsForPrompt(
+    content::WebContents* sender_web_contents,
+    content::BrowserContext* browser_context,
+    const std::string& app_id) {
+  // Check if the sender web contents supports modal dialogs.
+  if (sender_web_contents &&
+      web_modal::WebContentsModalDialogManager::FromWebContents(
+          sender_web_contents)) {
+    return sender_web_contents;
+  }
+  // Otherwise, check for the current app window for the app (app windows
+  // support modal dialogs).
+  if (!app_id.empty()) {
+    AppWindow* window = AppWindowRegistry::Get(browser_context)
+                            ->GetCurrentAppWindowForApp(app_id);
+    if (window)
+      return window->web_contents();
+  }
+  return nullptr;
+}
+
 }  // namespace
 
 MediaGalleriesEventRouter::MediaGalleriesEventRouter(
     content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)), weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile_);
 
   EventRouter::Get(profile_)->RegisterObserver(
       this, MediaGalleries::OnGalleryChanged::kEventName);
@@ skipping 163 matching lines @@
   }
 
   // The custom JS binding will use this list to create DOMFileSystem objects.
   SetResult(std::move(list));
   SendResponse(true);
 }
 
 void MediaGalleriesGetMediaFileSystemsFunction::ShowDialog() {
   media_galleries::UsageCount(media_galleries::SHOW_DIALOG);
   WebContents* contents =
-      ChromeExtensionFunctionDetails(this).GetOriginWebContents();
+      GetWebContentsForPrompt(GetSenderWebContents(),
+                              browser_context(),
+                              extension()->id());
   if (!contents) {
     SendResponse(false);
     return;
   }
 
   // Controller will delete itself.
   base::Closure cb = base::Bind(
       &MediaGalleriesGetMediaFileSystemsFunction::GetAndReturnGalleries, this);
   new MediaGalleriesPermissionController(contents, *extension(), cb);
 }
@@ skipping 16 matching lines @@
 MediaGalleriesAddUserSelectedFolderFunction::
     ~MediaGalleriesAddUserSelectedFolderFunction() {}
 
 bool MediaGalleriesAddUserSelectedFolderFunction::RunAsync() {
   media_galleries::UsageCount(media_galleries::ADD_USER_SELECTED_FOLDER);
   return Setup(GetProfile(), &error_, base::Bind(
       &MediaGalleriesAddUserSelectedFolderFunction::OnPreferencesInit, this));
 }
 
 void MediaGalleriesAddUserSelectedFolderFunction::OnPreferencesInit() {
-  Profile* profile = GetProfile();
   const std::string& app_id = extension()->id();
   WebContents* contents =
-      ChromeExtensionFunctionDetails(this).GetOriginWebContents();
+      GetWebContentsForPrompt(GetSenderWebContents(),
+                              browser_context(),
+                              app_id);
   if (!contents) {
     SendResponse(false);
     return;
   }
 
   if (!user_gesture()) {
     OnDirectorySelected(base::FilePath());
     return;
   }
 
   base::FilePath last_used_path =
       extensions::file_system_api::GetLastChooseEntryDirectory(
-          extensions::ExtensionPrefs::Get(profile), app_id);
+          extensions::ExtensionPrefs::Get(browser_context()), app_id);
   SelectDirectoryDialog::Callback callback = base::Bind(
       &MediaGalleriesAddUserSelectedFolderFunction::OnDirectorySelected, this);
   scoped_refptr<SelectDirectoryDialog> select_directory_dialog =
       new SelectDirectoryDialog(contents, callback);
   select_directory_dialog->Show(last_used_path);
 }
 
 void MediaGalleriesAddUserSelectedFolderFunction::OnDirectorySelected(
     const base::FilePath& selected_directory) {
   if (selected_directory.empty()) {
@@ skipping 359 matching lines @@
     SendResponse(false);
     return;
   }
 
   gallery_watch_manager()->RemoveWatch(
       GetProfile(), extension_id(), gallery_pref_id);
   SendResponse(true);
 }
 
 }  // namespace extensions