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

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

Issue 2060633002: mash: Introduce WmSystemTrayNotifier for //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@testupdate
Patch Set: rebase Created 4 years, 6 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 26 matching lines...) Expand all
37 #include "components/user_manager/user_manager.h" 37 #include "components/user_manager/user_manager.h"
38 #include "content/public/browser/notification_observer.h" 38 #include "content/public/browser/notification_observer.h"
39 #include "content/public/browser/notification_registrar.h" 39 #include "content/public/browser/notification_registrar.h"
40 #include "device/bluetooth/bluetooth_adapter.h" 40 #include "device/bluetooth/bluetooth_adapter.h"
41 #include "device/bluetooth/bluetooth_discovery_session.h" 41 #include "device/bluetooth/bluetooth_discovery_session.h"
42 #include "extensions/browser/app_window/app_window_registry.h" 42 #include "extensions/browser/app_window/app_window_registry.h"
43 #include "ui/base/ime/chromeos/input_method_manager.h" 43 #include "ui/base/ime/chromeos/input_method_manager.h"
44 #include "ui/chromeos/ime/input_method_menu_manager.h" 44 #include "ui/chromeos/ime/input_method_menu_manager.h"
45 45
46 namespace ash { 46 namespace ash {
47 class WmSystemTrayNotifier;
47 class VPNDelegate; 48 class VPNDelegate;
48 } 49 }
49 50
50 namespace user_manager { 51 namespace user_manager {
51 class User; 52 class User;
52 } 53 }
53 54
54 namespace chromeos { 55 namespace chromeos {
55 56
56 class SystemTrayDelegateChromeOS 57 class SystemTrayDelegateChromeOS
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 159
159 void UserChangedChildStatus(user_manager::User* user) override; 160 void UserChangedChildStatus(user_manager::User* user) override;
160 161
161 // browser tests need to call ShouldUse24HourClock(). 162 // browser tests need to call ShouldUse24HourClock().
162 bool GetShouldUse24HourClockForTesting() const; 163 bool GetShouldUse24HourClockForTesting() const;
163 164
164 // chromeos::system::SystemClockObserver implementation. 165 // chromeos::system::SystemClockObserver implementation.
165 void OnSystemClockChanged(system::SystemClock*) override; 166 void OnSystemClockChanged(system::SystemClock*) override;
166 167
167 private: 168 private:
168
169 ash::SystemTray* GetPrimarySystemTray(); 169 ash::SystemTray* GetPrimarySystemTray();
170 170
171 ash::SystemTrayNotifier* GetSystemTrayNotifier(); 171 ash::SystemTrayNotifier* GetSystemTrayNotifier();
172 172
173 ash::WmSystemTrayNotifier* GetWmSystemTrayNotifier();
174
173 void SetProfile(Profile* profile); 175 void SetProfile(Profile* profile);
174 176
175 bool UnsetProfile(Profile* profile); 177 bool UnsetProfile(Profile* profile);
176 178
177 bool ShouldUse24HourClock() const; 179 bool ShouldUse24HourClock() const;
178 180
179 void UpdateShowLogoutButtonInTray(); 181 void UpdateShowLogoutButtonInTray();
180 182
181 void UpdateLogoutDialogDuration(); 183 void UpdateLogoutDialogDuration();
182 184
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 316
315 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 317 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
316 318
317 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 319 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
318 }; 320 };
319 321
320 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 322 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
321 323
322 } // namespace chromeos 324 } // namespace chromeos
323 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 325 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/system/tray_update_unittest.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