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

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

Issue 2568413002: Revert of ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: Created 4 years 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/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 012ac31347e959ff3ad61a442fe173685aa44ca8..bb839411a35b3f4c5f6573d624daed982d621245 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -70,6 +70,10 @@
~SystemTrayDelegateChromeOS() override;
+ // Access a global pointer to the single instance of the
+ // SystemTrayDelegateChromeOS class.
+ static SystemTrayDelegateChromeOS* instance();
+
void InitializeOnAdapterReady(
scoped_refptr<device::BluetoothAdapter> adapter);
@@ -84,6 +88,7 @@
base::string16 GetSupervisedUserMessage() const override;
bool IsUserSupervised() const override;
bool IsUserChild() const override;
+ void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
bool ShouldShowSettings() const override;
bool ShouldShowNotificationTray() const override;
void ShowEnterpriseInfo() override;
@@ -122,6 +127,11 @@
void UserChangedChildStatus(user_manager::User* user) override;
+ // This notifies the system that a flash update is now available, and so the
+ // user should reboot.
+ void SetFlashUpdateAvailable();
+ bool GetFlashUpdateAvailable();
+
private:
ash::SystemTrayNotifier* GetSystemTrayNotifier();
@@ -234,6 +244,7 @@
std::string enterprise_realm_;
bool should_run_bluetooth_discovery_ = false;
bool session_started_ = false;
+ bool flash_update_available_ = false;
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
std::unique_ptr<device::BluetoothDiscoverySession>
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client_browsertest.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