chrome/browser/extensions/default_apps.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/default_apps.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/default_apps.h ('k') | chrome/browser/extensions/default_apps_unittest.cc » ('j') | chrome/browser/extensions/external_provider_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/default_apps.cc

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

index 604f0cd7783aa3b8ac005099a07f03a81afcb47d..2562dfe7def1a9f8f87d3eb7006be0ccd1641460 100644

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

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

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

#include "chrome/common/pref_names.h"

#include "ui/base/l10n/l10n_util.h"

@@ -132,8 +133,8 @@ bool Provider::ShouldInstallInProfile() {

Provider::Provider(Profile* profile,

VisitorInterface* service,

extensions::ExternalLoader* loader,

- extensions::Extension::Location crx_location,

- extensions::Extension::Location download_location,

+ extensions::Manifest::Location crx_location,

+ extensions::Manifest::Location download_location,

int creation_flags)

: extensions::ExternalProviderImpl(service, loader, crx_location,

download_location, creation_flags),