Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: chrome/browser/chrome_to_mobile_service.cc

Issue 10874058: Remove invalid Chrome To Mobile DCHECK, infer notifications are enabled on receipt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_to_mobile_service.cc
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index 34afa32f246c0e47cdf43aff2b635e0c64a2ea4f..caf08aef9fb403d9c906532251a1e92bad3b568d 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -383,6 +383,8 @@ void ChromeToMobileService::OnIncomingNotification(
ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
kSyncInvalidationObjectIdChromeToMobileDeviceList)), 1U);
RequestDeviceSearch();
+ // TODO(msw|akalin): This may not necessarily mean notifications are enabled.
+ OnNotificationsEnabled();
}
const std::string& ChromeToMobileService::GetAccessTokenForTest() const {
@@ -509,7 +511,6 @@ void ChromeToMobileService::RequestAccessToken() {
}
void ChromeToMobileService::RequestDeviceSearch() {
- DCHECK(sync_invalidation_enabled_);
if (access_token_.empty()) {
// Enqueue this task to perform after obtaining an access token.
task_queue_.push(base::Bind(&ChromeToMobileService::RequestDeviceSearch,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698