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

Unified Diff: chrome/browser/extensions/extension_install_prompt.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/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index a83f77080a7f7a7ba9505f4c0f3a8842e95b7bcb..28ffef61a3c2687b1df8ffcb28c5053529b443aa 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -29,6 +29,7 @@
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/extensions/manifest.h"
#include "chrome/common/extensions/permissions/permission_set.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/web_contents.h"
@@ -43,6 +44,7 @@
using extensions::BundleInstaller;
using extensions::Extension;
+using extensions::Manifest;
using extensions::PermissionSet;
namespace {
@@ -375,7 +377,7 @@ scoped_refptr<Extension>
return Extension::Create(
FilePath(),
- Extension::INTERNAL,
+ Manifest::INTERNAL,
localized_manifest.get() ? *localized_manifest.get() : *manifest,
flags,
id,
@@ -630,8 +632,8 @@ void ExtensionInstallPrompt::OnMintTokenFailure(
void ExtensionInstallPrompt::ShowConfirmation() {
if (permissions_ &&
(!extension_ || !extension_->ShouldSkipPermissionWarnings())) {
- Extension::Type extension_type = extension_ ? extension_->GetType() :
- Extension::TYPE_UNKNOWN;
+ Manifest::Type extension_type = extension_ ?
+ extension_->GetType() : Manifest::TYPE_UNKNOWN;
prompt_.SetPermissions(permissions_->GetWarningMessages(extension_type));
}
« no previous file with comments | « chrome/browser/extensions/extension_info_map_unittest.cc ('k') | chrome/browser/extensions/extension_nacl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698