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

Unified Diff: trunk/src/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc

Issue 14401006: Revert 195482 "Make DriveSystemService an observer of DriveNotif..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/chrome/browser/sync_file_system/drive_file_sync_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc (revision 195487)
+++ trunk/src/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc (working copy)
@@ -24,8 +24,6 @@
#include "chrome/browser/google_apis/auth_service.h"
#include "chrome/browser/google_apis/drive_api_parser.h"
#include "chrome/browser/google_apis/drive_api_util.h"
-#include "chrome/browser/google_apis/drive_notification_manager.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.h"
#include "chrome/browser/google_apis/drive_service_interface.h"
#include "chrome/browser/google_apis/drive_switches.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
@@ -516,16 +514,13 @@
void DriveInternalsWebUIHandler::OnGetFilesystemMetadataForDeltaUpdate(
const drive::DriveFileSystemMetadata& metadata) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- Profile* profile = Profile::FromWebUI(web_ui());
- google_apis::DriveNotificationManager* drive_notification_manager =
- google_apis::DriveNotificationManagerFactory::GetForProfile(profile);
- if (!drive_notification_manager)
+ drive::DriveSystemService* const system_service = GetSystemService();
+ if (!system_service)
return;
base::DictionaryValue delta_update_status;
- delta_update_status.SetBoolean(
- "push-notification-enabled",
- drive_notification_manager->IsPushNotificationEnabled());
+ delta_update_status.SetBoolean("push-notification-enabled",
+ system_service->PushNotificationEnabled());
delta_update_status.SetString(
"last-update-check-time",
google_apis::util::FormatTimeAsStringLocaltime(
« no previous file with comments | « trunk/src/chrome/browser/sync_file_system/drive_file_sync_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698