chrome/browser/sync/test/integration/sync_app_helper.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/sync/test/integration/sync_app_helper.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/profile_resetter/brandcoded_default_settings.cc ('k') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/sync_app_helper.cc

diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc

index 94d55bf479cefdfa9f5138a7e73833694f14df40..f0bbe6bd7be014fc57dcf4e70bd3c9aaf142f89d 100644

--- a/chrome/browser/sync/test/integration/sync_app_helper.cc

+++ b/chrome/browser/sync/test/integration/sync_app_helper.cc

@@ -13,13 +13,12 @@

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

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

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

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

#include "extensions/browser/app_sorting.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

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

#include "extensions/common/extension_set.h"

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

using extensions::ExtensionPrefs;

@@ -174,7 +173,7 @@ syncer::StringOrdinal SyncAppHelper::GetPageOrdinalForApp(

Profile* profile,

const std::string& name) {

return ExtensionPrefs::Get(profile)->app_sorting()->GetPageOrdinal(

- extensions::id_util::GenerateId(name));

+ crx_file::id_util::GenerateId(name));

}

void SyncAppHelper::SetPageOrdinalForApp(

@@ -182,14 +181,14 @@ void SyncAppHelper::SetPageOrdinalForApp(

const std::string& name,

const syncer::StringOrdinal& page_ordinal) {

ExtensionPrefs::Get(profile)->app_sorting()->SetPageOrdinal(

- extensions::id_util::GenerateId(name), page_ordinal);

+ crx_file::id_util::GenerateId(name), page_ordinal);

}

syncer::StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(

Profile* profile,

const std::string& name) {

return ExtensionPrefs::Get(profile)->app_sorting()->GetAppLaunchOrdinal(

- extensions::id_util::GenerateId(name));

+ crx_file::id_util::GenerateId(name));

}

void SyncAppHelper::SetAppLaunchOrdinalForApp(

@@ -197,7 +196,7 @@ void SyncAppHelper::SetAppLaunchOrdinalForApp(

const std::string& name,

const syncer::StringOrdinal& app_launch_ordinal) {

ExtensionPrefs::Get(profile)->app_sorting()->SetAppLaunchOrdinal(

- extensions::id_util::GenerateId(name), app_launch_ordinal);

+ crx_file::id_util::GenerateId(name), app_launch_ordinal);

}

void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {