| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_H_ | 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_H_ |
| 7 | 7 |
| 8 #include "ash/public/interfaces/system_tray.mojom.h" | 8 #include "ash/public/interfaces/system_tray.mojom.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "chrome/browser/chromeos/system/system_clock_observer.h" | 10 #include "chrome/browser/chromeos/system/system_clock_observer.h" |
| 11 #include "mojo/public/cpp/bindings/binding.h" | 11 #include "mojo/public/cpp/bindings/binding.h" |
| 12 | 12 |
| 13 // Handles method calls delegated back to chrome from ash. Also notifies ash of | 13 // Handles method calls delegated back to chrome from ash. Also notifies ash of |
| 14 // relevant state changes in chrome. | 14 // relevant state changes in chrome. |
| 15 // TODO: Consider renaming this to SystemTrayClientChromeOS. | 15 // TODO: Consider renaming this to SystemTrayClientChromeOS. |
| 16 class SystemTrayClient : public ash::mojom::SystemTrayClient, | 16 class SystemTrayClient : public ash::mojom::SystemTrayClient, |
| 17 public chromeos::system::SystemClockObserver { | 17 public chromeos::system::SystemClockObserver { |
| 18 public: | 18 public: |
| 19 static const char kDisplaySettingsSubPageName[]; |
| 20 static const char kDisplayOverscanSettingsSubPageName[]; |
| 21 |
| 19 SystemTrayClient(); | 22 SystemTrayClient(); |
| 20 ~SystemTrayClient() override; | 23 ~SystemTrayClient() override; |
| 21 | 24 |
| 22 static SystemTrayClient* Get(); | 25 static SystemTrayClient* Get(); |
| 23 | 26 |
| 24 private: | 27 private: |
| 25 // Connects or reconnects the |system_tray_| interface. | 28 // Connects or reconnects the |system_tray_| interface. |
| 26 void ConnectToSystemTray(); | 29 void ConnectToSystemTray(); |
| 27 | 30 |
| 28 // Handles errors on the |system_tray_| interface connection. | 31 // Handles errors on the |system_tray_| interface connection. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 46 // chromeos::system::SystemClockObserver: | 49 // chromeos::system::SystemClockObserver: |
| 47 void OnSystemClockChanged(chromeos::system::SystemClock* clock) override; | 50 void OnSystemClockChanged(chromeos::system::SystemClock* clock) override; |
| 48 | 51 |
| 49 // System tray mojo service in ash. | 52 // System tray mojo service in ash. |
| 50 ash::mojom::SystemTrayPtr system_tray_; | 53 ash::mojom::SystemTrayPtr system_tray_; |
| 51 | 54 |
| 52 DISALLOW_COPY_AND_ASSIGN(SystemTrayClient); | 55 DISALLOW_COPY_AND_ASSIGN(SystemTrayClient); |
| 53 }; | 56 }; |
| 54 | 57 |
| 55 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_H_ | 58 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_CLIENT_H_ |
| OLD | NEW |