chrome/browser/extensions/api/signed_in_devices/id_mapping_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/extensions/api/signed_in_devices/id_mapping_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/extensions/api/push_messaging/push_messaging_invalidation_handler.cc ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

index 322ae8288b98ed5cf27f0e0894b9d2e1aacd5752..9b41995d3fca5b9cfa313636e63fd095de544416 100644

--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

@@ -12,7 +12,7 @@

#include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/glue/device_info.h"

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

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

using base::DictionaryValue;

using base::Value;

@@ -88,8 +88,8 @@ scoped_ptr<DeviceInfo> GetDeviceInfoForClientId(

const std::string& client_id,

const std::string& extension_id,

Profile* profile) {

- DCHECK(Extension::IdIsValid(extension_id)) << extension_id

- << " is not valid";

+ DCHECK(crx_file::id_util::IdIsValid(extension_id)) << extension_id

+ << " is not valid";

ScopedVector<DeviceInfo> devices = GetAllSignedInDevices(extension_id,

profile);

for (ScopedVector<DeviceInfo>::iterator it = devices.begin();