Index: chrome/browser/extensions/api/downloads/downloads_api.cc |
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc |
index 704f46394620c871222fd6d7a7f8d1e8c8ee0fa3..a98c89f60e8baf0d5ce49404c7d252f3d26e9bd4 100644 |
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc |
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc |
@@ -35,7 +35,6 @@ |
#include "chrome/browser/download/download_shelf.h" |
#include "chrome/browser/download/download_stats.h" |
#include "chrome/browser/download/drag_download_item.h" |
-#include "chrome/browser/extensions/extension_warning_service.h" |
#include "chrome/browser/icon_loader.h" |
#include "chrome/browser/icon_manager.h" |
#include "chrome/browser/platform_util.h" |
@@ -64,6 +63,7 @@ |
#include "extensions/browser/extension_prefs.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/notification_types.h" |
+#include "extensions/browser/warning_service.h" |
#include "extensions/common/permissions/permissions_data.h" |
#include "net/base/filename_util.h" |
#include "net/base/load_flags.h" |
@@ -738,7 +738,7 @@ class ExtensionDownloadsEventRouterData : public base::SupportsUserData::Data { |
// later take precedence over previous extensions. |
if (!filename.empty() || |
(conflict_action != downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY)) { |
- ExtensionWarningSet warnings; |
+ WarningSet warnings; |
std::string winner_extension_id; |
ExtensionDownloadsEventRouter::DetermineFilenameInternal( |
filename, |
@@ -752,7 +752,7 @@ class ExtensionDownloadsEventRouterData : public base::SupportsUserData::Data { |
&determined_conflict_action_, |
&warnings); |
if (!warnings.empty()) |
- ExtensionWarningService::NotifyWarningsOnUI(profile, warnings); |
+ WarningService::NotifyWarningsOnUI(profile, warnings); |
if (winner_extension_id == determiners_[index].extension_id) |
determiner_ = determiners_[index]; |
} |
@@ -1666,7 +1666,7 @@ void ExtensionDownloadsEventRouter::DetermineFilenameInternal( |
std::string* winner_extension_id, |
base::FilePath* determined_filename, |
downloads::FilenameConflictAction* determined_conflict_action, |
- ExtensionWarningSet* warnings) { |
+ WarningSet* warnings) { |
DCHECK(!filename.empty() || |
(conflict_action != downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY)); |
DCHECK(!suggesting_extension_id.empty()); |
@@ -1680,7 +1680,7 @@ void ExtensionDownloadsEventRouter::DetermineFilenameInternal( |
if (suggesting_install_time < incumbent_install_time) { |
*winner_extension_id = incumbent_extension_id; |
- warnings->insert(ExtensionWarning::CreateDownloadFilenameConflictWarning( |
+ warnings->insert(Warning::CreateDownloadFilenameConflictWarning( |
suggesting_extension_id, |
incumbent_extension_id, |
filename, |
@@ -1689,7 +1689,7 @@ void ExtensionDownloadsEventRouter::DetermineFilenameInternal( |
} |
*winner_extension_id = suggesting_extension_id; |
- warnings->insert(ExtensionWarning::CreateDownloadFilenameConflictWarning( |
+ warnings->insert(Warning::CreateDownloadFilenameConflictWarning( |
incumbent_extension_id, |
suggesting_extension_id, |
*determined_filename, |