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

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

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 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 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 public: 74 public:
75 SystemTrayDelegateChromeOS(); 75 SystemTrayDelegateChromeOS();
76 76
77 ~SystemTrayDelegateChromeOS() override; 77 ~SystemTrayDelegateChromeOS() override;
78 78
79 void InitializeOnAdapterReady( 79 void InitializeOnAdapterReady(
80 scoped_refptr<device::BluetoothAdapter> adapter); 80 scoped_refptr<device::BluetoothAdapter> adapter);
81 81
82 // Overridden from ash::SystemTrayDelegate: 82 // Overridden from ash::SystemTrayDelegate:
83 void Initialize() override; 83 void Initialize() override;
84 void Shutdown() override;
85 bool GetTrayVisibilityOnStartup() override; 84 bool GetTrayVisibilityOnStartup() override;
86 ash::LoginStatus GetUserLoginStatus() const override; 85 ash::LoginStatus GetUserLoginStatus() const override;
87 void ChangeProfilePicture() override; 86 void ChangeProfilePicture() override;
88 std::string GetEnterpriseDomain() const override; 87 std::string GetEnterpriseDomain() const override;
89 base::string16 GetEnterpriseMessage() const override; 88 base::string16 GetEnterpriseMessage() const override;
90 std::string GetSupervisedUserManager() const override; 89 std::string GetSupervisedUserManager() const override;
91 base::string16 GetSupervisedUserManagerName() const override; 90 base::string16 GetSupervisedUserManagerName() const override;
92 base::string16 GetSupervisedUserMessage() const override; 91 base::string16 GetSupervisedUserMessage() const override;
93 bool IsUserSupervised() const override; 92 bool IsUserSupervised() const override;
94 bool IsUserChild() const override; 93 bool IsUserChild() const override;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 314
316 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 315 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
317 316
318 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 317 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
319 }; 318 };
320 319
321 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 320 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
322 321
323 } // namespace chromeos 322 } // namespace chromeos
324 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 323 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698