chrome/browser/extensions/updater/extension_updater.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/updater/extension_updater.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/updater/extension_downloader.cc ('k') | chrome/browser/extensions/updater/extension_updater_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/updater/extension_updater.cc

diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc

index e379cebceea2717c5804c76198bf095f5a83dd02..ab60b598a6d8f907975ef993a995985bfb1dc79b 100644

--- a/chrome/browser/extensions/updater/extension_updater.cc

+++ b/chrome/browser/extensions/updater/extension_updater.cc

@@ -25,6 +25,7 @@

#include "chrome/common/chrome_notification_types.h"

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

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

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

#include "chrome/common/pref_names.h"

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

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

@@ -304,7 +305,7 @@ void ExtensionUpdater::AddToDownloader(

for (ExtensionSet::const_iterator extension_iter = extensions->begin();

extension_iter != extensions->end(); ++extension_iter) {

const Extension& extension = **extension_iter;

- if (!Extension::IsAutoUpdateableLocation(extension.location())) {

+ if (!Manifest::IsAutoUpdateableLocation(extension.location())) {

VLOG(2) << "Extension " << extension.id() << " is not auto updateable";

continue;

}

@@ -354,7 +355,7 @@ void ExtensionUpdater::CheckNow(const CheckParams& params) {

for (iter = pending_ids.begin(); iter != pending_ids.end(); ++iter) {

const PendingExtensionInfo* info = pending_extension_manager->GetById(

*iter);

- if (!Extension::IsAutoUpdateableLocation(info->install_source())) {

+ if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {

VLOG(2) << "Extension " << *iter << " is not auto updateable";

continue;

}