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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2493973003: Display "Restart to update" dialog to Chrome OS users. (Closed)
Patch Set: Display "Restart to update" dialog to Chrome OS users. Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ash::VPNDelegate* GetVPNDelegate() const override; 118 ash::VPNDelegate* GetVPNDelegate() const override;
119 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( 119 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
120 ash::SystemTray* tray) override; 120 ash::SystemTray* tray) override;
121 121
122 // Overridden from user_manager::UserManager::UserSessionStateObserver: 122 // Overridden from user_manager::UserManager::UserSessionStateObserver:
123 void UserAddedToSession(const user_manager::User* active_user) override; 123 void UserAddedToSession(const user_manager::User* active_user) override;
124 void ActiveUserChanged(const user_manager::User* active_user) override; 124 void ActiveUserChanged(const user_manager::User* active_user) override;
125 125
126 void UserChangedChildStatus(user_manager::User* user) override; 126 void UserChangedChildStatus(user_manager::User* user) override;
127 127
128 static SystemTrayDelegateChromeOS* Get();
James Cook 2016/11/17 00:43:43 put this at the top, near the constructor
Greg K 2016/11/30 19:30:30 Done.
129 void SetFlashUpdateAvailable();
James Cook 2016/11/17 00:43:43 function comment please
Greg K 2016/11/30 19:30:30 Done.
130
128 private: 131 private:
129 ash::SystemTrayNotifier* GetSystemTrayNotifier(); 132 ash::SystemTrayNotifier* GetSystemTrayNotifier();
130 133
131 void SetProfile(Profile* profile); 134 void SetProfile(Profile* profile);
132 135
133 bool UnsetProfile(Profile* profile); 136 bool UnsetProfile(Profile* profile);
134 137
135 void UpdateShowLogoutButtonInTray(); 138 void UpdateShowLogoutButtonInTray();
136 139
137 void UpdateLogoutDialogDuration(); 140 void UpdateLogoutDialogDuration();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 Profile* user_profile_ = nullptr; 233 Profile* user_profile_ = nullptr;
231 int search_key_mapped_to_ = input_method::kSearchKey; 234 int search_key_mapped_to_ = input_method::kSearchKey;
232 bool have_session_start_time_ = false; 235 bool have_session_start_time_ = false;
233 base::TimeTicks session_start_time_; 236 base::TimeTicks session_start_time_;
234 bool have_session_length_limit_ = false; 237 bool have_session_length_limit_ = false;
235 base::TimeDelta session_length_limit_; 238 base::TimeDelta session_length_limit_;
236 std::string enterprise_domain_; 239 std::string enterprise_domain_;
237 std::string enterprise_realm_; 240 std::string enterprise_realm_;
238 bool should_run_bluetooth_discovery_ = false; 241 bool should_run_bluetooth_discovery_ = false;
239 bool session_started_ = false; 242 bool session_started_ = false;
243 bool flash_update_available_ = false;
240 244
241 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 245 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
242 std::unique_ptr<device::BluetoothDiscoverySession> 246 std::unique_ptr<device::BluetoothDiscoverySession>
243 bluetooth_discovery_session_; 247 bluetooth_discovery_session_;
244 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; 248 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
245 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 249 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
246 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 250 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
247 std::unique_ptr<ash::VPNDelegate> vpn_delegate_; 251 std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
248 252
249 base::ObserverList<ash::CustodianInfoTrayObserver> 253 base::ObserverList<ash::CustodianInfoTrayObserver>
250 custodian_info_changed_observers_; 254 custodian_info_changed_observers_;
251 255
252 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 256 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
253 257
254 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 258 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
255 }; 259 };
256 260
257 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 261 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
258 262
259 } // namespace chromeos 263 } // namespace chromeos
260 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 264 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698