chrome/browser/extensions/extension_system.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_system.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_startup_browsertest.cc ('k') | chrome/browser/extensions/extension_ui_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_system.cc

diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc

index dd7d8a1bfa4bf6d6c868160c6a3073c98c629442..7a1d9e83c099dab70d175aef6099fc12bad141bc 100644

--- a/chrome/browser/extensions/extension_system.cc

+++ b/chrome/browser/extensions/extension_system.cc

@@ -43,6 +43,7 @@

#include "chrome/common/chrome_version_info.h"

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

#include "chrome/common/extensions/features/feature.h"

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

#include "chrome/common/pref_names.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/url_data_source.h"

@@ -431,7 +432,7 @@ Blacklist* ExtensionSystemImpl::blacklist() {

void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(

const Extension* extension) {

base::Time install_time;

- if (extension->location() != Extension::COMPONENT) {

+ if (extension->location() != Manifest::COMPONENT) {

install_time = extension_service()->extension_prefs()->

GetInstallTime(extension->id());

}