chrome/browser/extensions/extension_webkit_preferences.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/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

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

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;