| 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 ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ | 5 #ifndef ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ |
| 6 #define ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ | 6 #define ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "ash/common/system/tray/default_system_tray_delegate.h" | 10 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 9 #include "ash/public/interfaces/system_tray.mojom.h" | 11 #include "ash/public/interfaces/system_tray.mojom.h" |
| 10 #include "base/i18n/time_formatting.h" | 12 #include "base/i18n/time_formatting.h" |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 | 14 |
| 13 namespace shell { | 15 namespace shell { |
| 14 class Connector; | 16 class Connector; |
| 15 } | 17 } |
| 16 | 18 |
| 17 namespace ash { | 19 namespace ash { |
| 18 | 20 |
| 21 class VPNDelegate; |
| 22 |
| 19 // Handles the settings displayed in the system tray menu. For mus most settings | 23 // Handles the settings displayed in the system tray menu. For mus most settings |
| 20 // are obtained from chrome browser via mojo IPC. For the classic ash version | 24 // are obtained from chrome browser via mojo IPC. For the classic ash version |
| 21 // see SystemTrayDelegateChromeOS. | 25 // see SystemTrayDelegateChromeOS. |
| 22 // | 26 // |
| 23 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412. | 27 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412. |
| 24 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate, | 28 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate, |
| 25 public mojom::SystemTray { | 29 public mojom::SystemTray { |
| 26 public: | 30 public: |
| 27 explicit SystemTrayDelegateMus(shell::Connector* connector); | 31 explicit SystemTrayDelegateMus(shell::Connector* connector); |
| 28 ~SystemTrayDelegateMus() override; | 32 ~SystemTrayDelegateMus() override; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 47 void ShowChromeSlow() override; | 51 void ShowChromeSlow() override; |
| 48 void ShowIMESettings() override; | 52 void ShowIMESettings() override; |
| 49 void ShowHelp() override; | 53 void ShowHelp() override; |
| 50 void ShowAccessibilityHelp() override; | 54 void ShowAccessibilityHelp() override; |
| 51 void ShowAccessibilitySettings() override; | 55 void ShowAccessibilitySettings() override; |
| 52 void ShowPaletteHelp() override; | 56 void ShowPaletteHelp() override; |
| 53 void ShowPaletteSettings() override; | 57 void ShowPaletteSettings() override; |
| 54 void ShowPublicAccountInfo() override; | 58 void ShowPublicAccountInfo() override; |
| 55 void ShowEnterpriseInfo() override; | 59 void ShowEnterpriseInfo() override; |
| 56 void ShowProxySettings() override; | 60 void ShowProxySettings() override; |
| 61 NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; |
| 62 VPNDelegate* GetVPNDelegate() const override; |
| 57 | 63 |
| 58 // mojom::SystemTray: | 64 // mojom::SystemTray: |
| 59 void SetUse24HourClock(bool use_24_hour) override; | 65 void SetUse24HourClock(bool use_24_hour) override; |
| 60 | 66 |
| 61 // May be null in unit tests. | 67 // May be null in unit tests. |
| 62 shell::Connector* connector_; | 68 shell::Connector* connector_; |
| 63 | 69 |
| 64 // Client interface in chrome browser. | 70 // Client interface in chrome browser. |
| 65 mojom::SystemTrayClientPtr system_tray_client_; | 71 mojom::SystemTrayClientPtr system_tray_client_; |
| 66 | 72 |
| 67 // 12 or 24 hour display. | 73 // 12 or 24 hour display. |
| 68 base::HourClockType hour_clock_type_; | 74 base::HourClockType hour_clock_type_; |
| 69 | 75 |
| 76 std::unique_ptr<NetworkingConfigDelegate> networking_config_delegate_; |
| 77 std::unique_ptr<VPNDelegate> vpn_delegate_; |
| 78 |
| 70 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus); | 79 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus); |
| 71 }; | 80 }; |
| 72 | 81 |
| 73 } // namespace ash | 82 } // namespace ash |
| 74 | 83 |
| 75 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ | 84 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ |
| OLD | NEW |