chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 11094061: drive: Move IsDriveEnabled() and DisableDrive() to DriveSystemService

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/chromeos/system/ash_system_tray_delegate.cc

Issue 11094061: drive: Move IsDriveEnabled() and DisableDrive() to DriveSystemService (Closed) Base URL: http://git.chromium.org/chromium/src.git@drive_available

Patch Set: rebase Created 8 years, 2 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

« chrome/browser/chromeos/gdata/drive_system_service.h ('K') | « chrome/browser/chromeos/gdata/drive_system_service.cc ('k') | chrome/browser/google_apis/gdata_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 5ca49b890846eadce0342bd464f3066adc688483..7e2560c367222095748cea135f0acbf89ae0998d 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -53,7 +53,6 @@

#include "chrome/browser/chromeos/status/network_menu_icon.h"

#include "chrome/browser/chromeos/system/timezone_settings.h"

#include "chrome/browser/chromeos/system_key_event_listener.h"

-#include "chrome/browser/google_apis/gdata_util.h"

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -1144,7 +1143,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

DriveSystemService* FindDriveSystemService() {

Profile* profile = ProfileManager::GetDefaultProfile();

- if (!gdata::util::IsDriveEnabled(profile))

+ if (!gdata::DriveSystemService::IsDriveEnabled(profile))

return NULL;

return DriveSystemServiceFactory::FindForProfile(profile);

}