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

Unified Diff: chrome/browser/extensions/crx_installer.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/extensions/crx_installer.h ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index e4e7d4aeee23cf49e5abc256f241dbad2ba0bd56..060956a9405625eb7d2436e25c2de85249368d4e 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -52,8 +52,6 @@
using content::BrowserThread;
using content::UserMetricsAction;
-using extensions::Extension;
-using extensions::PermissionsUpdater;
namespace {
@@ -67,6 +65,8 @@ enum OffStoreInstallDecision {
} // namespace
+namespace extensions {
not at google - send to devlin 2012/07/04 01:13:31 I think that usually the namespace would surround
+
// static
scoped_refptr<CrxInstaller> CrxInstaller::Create(
ExtensionService* frontend,
@@ -141,8 +141,8 @@ CrxInstaller::~CrxInstaller() {
void CrxInstaller::InstallCrx(const FilePath& source_file) {
source_file_ = source_file;
- scoped_refptr<extensions::SandboxedUnpacker> unpacker(
- new extensions::SandboxedUnpacker(
+ scoped_refptr<SandboxedUnpacker> unpacker(
+ new SandboxedUnpacker(
source_file,
content::ResourceDispatcherHost::Get() != NULL,
install_source_,
@@ -151,8 +151,7 @@ void CrxInstaller::InstallCrx(const FilePath& source_file) {
if (!BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- base::Bind(
- &extensions::SandboxedUnpacker::Start, unpacker.get())))
+ base::Bind(&SandboxedUnpacker::Start, unpacker.get())))
NOTREACHED();
}
@@ -247,7 +246,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
}
if (install_cause_ == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD) {
- if (extensions::switch_utils::IsEasyOffStoreInstallEnabled()) {
+ if (switch_utils::IsEasyOffStoreInstallEnabled()) {
const char* kHistogramName = "Extensions.OffStoreInstallDecisionEasy";
if (is_gallery_install()) {
UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
@@ -624,3 +623,5 @@ void CrxInstaller::NotifyCrxInstallComplete(const Extension* extension) {
content::Source<CrxInstaller>(this),
content::Details<const Extension>(extension));
}
+
+} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698