Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1654)

Unified Diff: chrome/browser/download/chrome_download_manager_delegate.cc

Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/chrome_download_manager_delegate.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 644b3d914078f04b1fc752be099ee15801cb8a54..cbf768c3b1c825c2eedd22a6fdeff9666936e0f8 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -330,16 +330,17 @@ bool ChromeDownloadManagerDelegate::ShouldCompleteDownload(
bool ChromeDownloadManagerDelegate::ShouldOpenDownload(DownloadItem* item) {
if (download_crx_util::IsExtensionDownload(*item)) {
- scoped_refptr<CrxInstaller> crx_installer =
+ scoped_refptr<extensions::CrxInstaller> crx_installer =
download_crx_util::OpenChromeExtension(profile_, *item);
// CRX_INSTALLER_DONE will fire when the install completes. Observe()
// will call DelayedDownloadOpened() on this item. If this DownloadItem
// is not around when CRX_INSTALLER_DONE fires, Complete() will not be
// called.
- registrar_.Add(this,
- chrome::NOTIFICATION_CRX_INSTALLER_DONE,
- content::Source<CrxInstaller>(crx_installer.get()));
+ registrar_.Add(
+ this,
+ chrome::NOTIFICATION_CRX_INSTALLER_DONE,
+ content::Source<extensions::CrxInstaller>(crx_installer.get()));
crx_installers_[crx_installer.get()] = item->GetId();
// The status text and percent complete indicator will change now
@@ -621,8 +622,8 @@ void ChromeDownloadManagerDelegate::Observe(
chrome::NOTIFICATION_CRX_INSTALLER_DONE,
source);
- scoped_refptr<CrxInstaller> installer =
- content::Source<CrxInstaller>(source).ptr();
+ scoped_refptr<extensions::CrxInstaller> installer =
+ content::Source<extensions::CrxInstaller>(source).ptr();
int download_id = crx_installers_[installer];
crx_installers_.erase(installer.get());
« no previous file with comments | « chrome/browser/download/chrome_download_manager_delegate.h ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698