chrome/browser/profile_resetter/brandcoded_default_settings.cc - Issue 481433005: Extensions: Move id_util functions to crx_file component.

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/profile_resetter/brandcoded_default_settings.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 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:

Index: chrome/browser/profile_resetter/brandcoded_default_settings.cc

diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.cc b/chrome/browser/profile_resetter/brandcoded_default_settings.cc

index 748992a43a4d97ca0f69e08b93803f3016878163..7d7f2cc92e28f3b55005c20614a3cb10827fd709 100644

--- a/chrome/browser/profile_resetter/brandcoded_default_settings.cc

+++ b/chrome/browser/profile_resetter/brandcoded_default_settings.cc

@@ -8,8 +8,8 @@

#include "base/logging.h"

#include "chrome/common/pref_names.h"

#include "chrome/installer/util/master_preferences_constants.h"

+#include "components/crx_file/id_util.h"

#include "components/search_engines/search_engines_pref_names.h"

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

BrandcodedDefaultSettings::BrandcodedDefaultSettings() {

}

@@ -71,7 +71,7 @@ bool BrandcodedDefaultSettings::GetExtensions(

&extensions)) {

for (base::DictionaryValue::Iterator extension_id(*extensions);

!extension_id.IsAtEnd(); extension_id.Advance()) {

- if (extensions::Extension::IdIsValid(extension_id.key()))

+ if (crx_file::id_util::IdIsValid(extension_id.key()))

extension_ids->push_back(extension_id.key());

}

return true;