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

Index: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

index b642967f38c13e058eaba7c262b4d4f283e2d794..6f091b599f3fea8ee4426a070d451ebdae9afb29 100644

--- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

@@ -10,6 +10,7 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_split.h"

#include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"

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

#include "components/invalidation/invalidation_service.h"

#include "components/invalidation/object_id_invalidation_map.h"

#include "extensions/common/extension.h"

@@ -60,7 +61,7 @@ bool ObjectIdToExtensionAndSubchannel(const invalidation::ObjectId& object_id,

DLOG(WARNING) << "Invalid format type from object name " << name;

return false;

}

- if (!Extension::IdIsValid(components[1])) {

+ if (!crx_file::id_util::IdIsValid(components[1])) {

DLOG(WARNING) << "Invalid extension ID from object name " << name;

return false;

}

@@ -103,7 +104,7 @@ void PushMessagingInvalidationHandler::SuppressInitialInvalidationsForExtension(

void PushMessagingInvalidationHandler::RegisterExtension(

const std::string& extension_id) {

DCHECK(thread_checker_.CalledOnValidThread());

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

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

registered_extensions_.insert(extension_id);

UpdateRegistrations();

}

@@ -111,7 +112,7 @@ void PushMessagingInvalidationHandler::RegisterExtension(

void PushMessagingInvalidationHandler::UnregisterExtension(

const std::string& extension_id) {

DCHECK(thread_checker_.CalledOnValidThread());

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

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

registered_extensions_.erase(extension_id);

UpdateRegistrations();

}