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

Side by Side Diff: chrome/browser/invalidation/invalidation_service_android.cc

Issue 179843002: Make invalidations work for Chrome OS Kiosk Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error leading to uninitialized memory access. Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/invalidation/invalidation_service_android.h" 5 #include "chrome/browser/invalidation/invalidation_service_android.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/invalidation/invalidation_controller_android.h" 8 #include "chrome/browser/invalidation/invalidation_controller_android.h"
9 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
10 #include "sync/notifier/object_id_invalidation_map.h" 10 #include "sync/notifier/object_id_invalidation_map.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 InvalidationLogger* InvalidationServiceAndroid::GetInvalidationLogger() { 63 InvalidationLogger* InvalidationServiceAndroid::GetInvalidationLogger() {
64 return &logger_; 64 return &logger_;
65 } 65 }
66 66
67 void InvalidationServiceAndroid::RequestDetailedStatus( 67 void InvalidationServiceAndroid::RequestDetailedStatus(
68 base::Callback<void(const base::DictionaryValue&)> return_callback) { 68 base::Callback<void(const base::DictionaryValue&)> return_callback) {
69 } 69 }
70 70
71 InvalidationAuthProvider*
72 InvalidationServiceAndroid::GetInvalidationAuthProvider() {
73 return NULL;
74 }
75
71 void InvalidationServiceAndroid::Observe( 76 void InvalidationServiceAndroid::Observe(
72 int type, 77 int type,
73 const content::NotificationSource& source, 78 const content::NotificationSource& source,
74 const content::NotificationDetails& details) { 79 const content::NotificationDetails& details) {
75 DCHECK(CalledOnValidThread()); 80 DCHECK(CalledOnValidThread());
76 DCHECK_EQ(type, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE); 81 DCHECK_EQ(type, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE);
77 82
78 content::Details<const syncer::ObjectIdInvalidationMap> 83 content::Details<const syncer::ObjectIdInvalidationMap>
79 state_details(details); 84 state_details(details);
80 const syncer::ObjectIdInvalidationMap object_invalidation_map = 85 const syncer::ObjectIdInvalidationMap object_invalidation_map =
(...skipping 12 matching lines...) Expand all
93 } 98 }
94 99
95 void InvalidationServiceAndroid::TriggerStateChangeForTest( 100 void InvalidationServiceAndroid::TriggerStateChangeForTest(
96 syncer::InvalidatorState state) { 101 syncer::InvalidatorState state) {
97 DCHECK(CalledOnValidThread()); 102 DCHECK(CalledOnValidThread());
98 invalidator_state_ = state; 103 invalidator_state_ = state;
99 invalidator_registrar_.UpdateInvalidatorState(invalidator_state_); 104 invalidator_registrar_.UpdateInvalidatorState(invalidator_state_);
100 } 105 }
101 106
102 } // namespace invalidation 107 } // namespace invalidation
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698