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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 410333005: Remove the drive status from the ash try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build. Created 6 years, 5 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 | « ash/system/user/tray_user.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 742a7cccf32d1119d5214fe10bf725194814bc4e..6aafa9a9dad61a2c717cb2cccbf4bba26b050eb0 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -18,8 +18,6 @@
#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_change_registrar.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/job_list.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
#include "chrome/browser/ui/browser_list_observer.h"
@@ -39,7 +37,6 @@ class SystemTrayDelegateChromeOS
: public ash::ime::InputMethodMenuManager::Observer,
public ash::SystemTrayDelegate,
public SessionManagerClient::Observer,
- public drive::JobListObserver,
public content::NotificationObserver,
public input_method::InputMethodManager::Observer,
public chromeos::LoginState::Observer,
@@ -79,7 +76,6 @@ class SystemTrayDelegateChromeOS
virtual void ShowDisplaySettings() OVERRIDE;
virtual void ShowChromeSlow() OVERRIDE;
virtual bool ShouldShowDisplayNotification() OVERRIDE;
- virtual void ShowDriveSettings() OVERRIDE;
virtual void ShowIMESettings() OVERRIDE;
virtual void ShowHelp() OVERRIDE;
virtual void ShowAccessibilityHelp() OVERRIDE;
@@ -106,9 +102,6 @@ class SystemTrayDelegateChromeOS
virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) OVERRIDE;
virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
- virtual void CancelDriveOperation(int32 operation_id) OVERRIDE;
- virtual void GetDriveOperationStatusList(ash::DriveOperationStatusList* list)
- OVERRIDE;
virtual void ShowNetworkConfigure(const std::string& network_id,
gfx::NativeWindow parent_window) OVERRIDE;
virtual bool EnrollNetwork(const std::string& network_id,
@@ -151,10 +144,6 @@ class SystemTrayDelegateChromeOS
bool UnsetProfile(Profile* profile);
- void ObserveDriveUpdates();
-
- void UnobserveDriveUpdates();
-
bool ShouldUse24HourClock() const;
void UpdateClockType();
@@ -211,16 +200,6 @@ class SystemTrayDelegateChromeOS
virtual void OnActiveOutputNodeChanged() OVERRIDE;
virtual void OnActiveInputNodeChanged() OVERRIDE;
- // drive::JobListObserver overrides.
- virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;
-
- virtual void OnJobDone(const drive::JobInfo& job_info,
- drive::FileError error) OVERRIDE;
-
- virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE;
-
- drive::DriveIntegrationService* FindDriveIntegrationService();
-
// Overridden from BluetoothAdapter::Observer.
virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
bool present) OVERRIDE;
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698