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

Unified Diff: chrome/browser/google_apis/drive_notification_manager_factory.cc

Issue 13891016: Merge ChromeOS and SyncFS XMPP Notification into one class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ChromeOS SigFault fix Created 7 years, 8 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
Index: chrome/browser/google_apis/drive_notification_manager_factory.cc
diff --git a/chrome/browser/google_apis/drive_notification_manager_factory.cc b/chrome/browser/google_apis/drive_notification_manager_factory.cc
index 37e769e6f713735edfa0a49a9922a3046fafb5b7..b2ec5e2dc12b5d1d6f2b1c0e161b8d613c6f2b88 100644
--- a/chrome/browser/google_apis/drive_notification_manager_factory.cc
+++ b/chrome/browser/google_apis/drive_notification_manager_factory.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/google_apis/drive_notification_manager.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
namespace google_apis {
@@ -13,6 +14,9 @@ namespace google_apis {
// static
DriveNotificationManager*
DriveNotificationManagerFactory::GetForProfile(Profile* profile) {
+ if (!ProfileSyncService::IsSyncEnabled())
+ return NULL;
+
return static_cast<DriveNotificationManager*>(
GetInstance()->GetServiceForProfile(profile, true));
}
« no previous file with comments | « chrome/browser/google_apis/drive_notification_manager.cc ('k') | chrome/browser/google_apis/drive_notification_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698