chrome/browser/download/download_crx_util.cc - Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 6 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

« no previous file with comments | « chrome/browser/download/download_crx_util.h ('k') | chrome/browser/extensions/crx_installer.h » ('j') | chrome/browser/extensions/crx_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_crx_util.cc

diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc

index c867ad3589b11962460adf2ef83c3f9942e709af..59a2d155e1b091207a8bc9a0de45afcd984a4ec4 100644

--- a/chrome/browser/download/download_crx_util.cc

+++ b/chrome/browser/download/download_crx_util.cc

@@ -68,7 +68,7 @@ void SetMockInstallPromptForTesting(ExtensionInstallPrompt* mock_prompt) {

mock_install_prompt_for_testing = mock_prompt;

}

-scoped_refptr<CrxInstaller> OpenChromeExtension(

+scoped_refptr<extensions::CrxInstaller> OpenChromeExtension(

Profile* profile,

const DownloadItem& download_item) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

@@ -76,8 +76,8 @@ scoped_refptr<CrxInstaller> OpenChromeExtension(

ExtensionService* service = profile->GetExtensionService();

CHECK(service);

- scoped_refptr<CrxInstaller> installer(

- CrxInstaller::Create(

+ scoped_refptr<extensions::CrxInstaller> installer(

+ extensions::CrxInstaller::Create(

service,

CreateExtensionInstallPrompt(profile),

WebstoreInstaller::GetAssociatedApproval(download_item)));

@@ -87,7 +87,7 @@ scoped_refptr<CrxInstaller> OpenChromeExtension(

if (OffStoreInstallAllowedByPrefs(profile, download_item)) {

installer->set_off_store_install_allow_reason(

- CrxInstaller::OffStoreInstallAllowedBecausePref);

+ extensions::CrxInstaller::OffStoreInstallAllowedBecausePref);

}

if (UserScript::IsURLUserScript(download_item.GetURL(),

« no previous file with comments | « chrome/browser/download/download_crx_util.h ('k') | chrome/browser/extensions/crx_installer.h » ('j') | chrome/browser/extensions/crx_installer.cc » ('J')