Refactored ExtensionUninstallDialog to take a NativeWindow instead of a Browser

chrome/browser/extensions/extension_storage_monitor.cc

 // Copyright 2014 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/extensions/extension_storage_monitor.h"
 
 #include <map>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_storage_monitor_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_loader.h"
@@ skipping 513 matching lines @@
   notified_extension_ids_.clear();
 }
 
 void ExtensionStorageMonitor::ShowUninstallPrompt(
     const std::string& extension_id) {
   const Extension* extension = GetExtensionById(context_, extension_id);
   if (!extension)
     return;
 
   if (!uninstall_dialog_.get()) {
-    uninstall_dialog_.reset(ExtensionUninstallDialog::Create(
-        Profile::FromBrowserContext(context_), NULL, this));
+    // TODO(sashab,tapted): A true |desktop_type| needs to be passed in at
+    // creation time to remove reliance on GetActiveDesktop(). See
+    // http://crbug.com/308360.
+    uninstall_dialog_.reset(ExtensionUninstallDialog::CreateForNonBrowserWindow(
+        Profile::FromBrowserContext(context_),
+        AppListService::Get(chrome::GetActiveDesktop())->GetAppListWindow(),

[tapted, 2014/07/11 04:39:15]

I don't think this call site is intending to use the app launcher r275262
suggests it could be from a piece of notification UI, in which case the right
solution is probably to center it in the screen. (Thanh-Mai probably knows the
answer :)

[sashab, 2014/07/11 05:58:57]

Done.

[tmdiep, 2014/07/11 06:13:29]

Yep, this isn't related to the app launcher. The uninstall is initiated by an
action in a message center notification. We don't have a parent window for this,
so just center it in the screen.

+        this));
   }
 
   uninstall_extension_id_ = extension->id();
   uninstall_dialog_->ConfirmUninstall(extension);
 }
 
 int64 ExtensionStorageMonitor::GetNextStorageThreshold(
     const std::string& extension_id) const {
   int next_threshold = GetNextStorageThresholdFromPrefs(extension_id);
   if (next_threshold == 0) {
@@ skipping 47 matching lines @@
 void ExtensionStorageMonitor::SetStorageNotificationEnabled(
     const std::string& extension_id,
     bool enable_notifications) {
   extension_prefs_->UpdateExtensionPref(
       extension_id,
       kPrefDisableStorageNotifications,
       enable_notifications ? NULL : new base::FundamentalValue(true));
 }
 
 }  // namespace extensions