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

Unified Diff: chrome/browser/extensions/extension_webkit_preferences.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_webkit_preferences.cc
diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc
index 2b79fa656d272459dd6c8f78d2856bcc94c5659c..3413442671effa4f3081f0aefaa705dcadc7d7b4 100644
--- a/chrome/browser/extensions/extension_webkit_preferences.cc
+++ b/chrome/browser/extensions/extension_webkit_preferences.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
#include "webkit/glue/webpreferences.h"
namespace extension_webkit_preferences {
@@ -53,7 +54,7 @@ void SetPreferences(const extensions::Extension* extension,
// sometimes loaded with chrome-extension: URLs - we should expect the
// performance characteristics to be similar in both cases.
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- if (extension->location() == extensions::Extension::COMPONENT &&
+ if (extension->location() == extensions::Manifest::COMPONENT &&
!command_line.HasSwitch(switches::kAllowWebUICompositing)) {
webkit_prefs->accelerated_compositing_enabled = false;
webkit_prefs->accelerated_2d_canvas_enabled = false;
« no previous file with comments | « chrome/browser/extensions/extension_ui_unittest.cc ('k') | chrome/browser/extensions/external_policy_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698