chrome/renderer/extensions/dispatcher.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/renderer/extensions/dispatcher.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

« chrome/common/extensions/manifest.cc ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | extensions/common/install_warning.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/dispatcher.cc

diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc

index 09ec7d3c2f2982fdfb1700c13b747beb0bcca1a5..18de8be104e2f0fa6d215a75172404c3c0ba0c94 100644

--- a/chrome/renderer/extensions/dispatcher.cc

+++ b/chrome/renderer/extensions/dispatcher.cc

@@ -14,6 +14,7 @@

#include "chrome/common/extensions/api/extension_api.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_messages.h"

+#include "chrome/common/extensions/manifest.h"

#include "chrome/common/extensions/permissions/permission_set.h"

#include "chrome/common/url_constants.h"

#include "chrome/common/view_type.h"

@@ -776,7 +777,7 @@ void Dispatcher::DidCreateScriptContext(

int manifest_version = extension ? extension->manifest_version() : 1;

bool send_request_disabled =

- (extension && extension->location() == Extension::LOAD &&

+ (extension && extension->location() == Manifest::LOAD &&

extension->has_lazy_background_page());

module_system->RegisterNativeHandler("process",

scoped_ptr<NativeHandler>(new ProcessInfoNativeHandler(