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

Unified Diff: chrome/browser/extensions/unpacked_installer.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/extensions/unpacked_installer.cc
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index cd4ae8fbe1a14f0643c95f6cf7272899bc92ce33..dceca42659794b78254eb8d6dd731df9e1586941 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/requirements_checker.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_file_util.h"
+#include "chrome/common/extensions/manifest.h"
#include "content/public/browser/browser_thread.h"
#include "sync/api/string_ordinal.h"
@@ -135,7 +136,7 @@ void UnpackedInstaller::LoadFromCommandLine(const FilePath& path_in) {
std::string error;
extension_ = extension_file_util::LoadExtension(
extension_path_,
- Extension::LOAD,
+ Manifest::LOAD,
GetFlags(),
&error);
@@ -169,7 +170,7 @@ void UnpackedInstaller::OnRequirementsChecked(
int UnpackedInstaller::GetFlags() {
std::string id = Extension::GenerateIdForPath(extension_path_);
bool allow_file_access =
- Extension::ShouldAlwaysAllowFileAccess(Extension::LOAD);
+ Manifest::ShouldAlwaysAllowFileAccess(Manifest::LOAD);
if (service_weak_->extension_prefs()->HasAllowFileAccessSetting(id))
allow_file_access = service_weak_->extension_prefs()->AllowFileAccess(id);
@@ -220,7 +221,7 @@ void UnpackedInstaller::LoadWithFileAccess(int flags) {
std::string error;
extension_ = extension_file_util::LoadExtension(
extension_path_,
- Extension::LOAD,
+ Manifest::LOAD,
flags,
&error);
« no previous file with comments | « chrome/browser/extensions/test_extension_prefs.cc ('k') | chrome/browser/extensions/updater/extension_downloader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698