| 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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/public/interfaces/system_tray.mojom.h" | 9 #include "ash/public/interfaces/system_tray.mojom.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 void ShowHelp(); | 50 void ShowHelp(); |
| 51 void ShowAccessibilityHelp(); | 51 void ShowAccessibilityHelp(); |
| 52 void ShowAccessibilitySettings(); | 52 void ShowAccessibilitySettings(); |
| 53 void ShowPaletteHelp(); | 53 void ShowPaletteHelp(); |
| 54 void ShowPaletteSettings(); | 54 void ShowPaletteSettings(); |
| 55 void ShowPublicAccountInfo(); | 55 void ShowPublicAccountInfo(); |
| 56 void ShowNetworkConfigure(const std::string& network_id); | 56 void ShowNetworkConfigure(const std::string& network_id); |
| 57 void ShowNetworkCreate(const std::string& type); | 57 void ShowNetworkCreate(const std::string& type); |
| 58 void ShowNetworkSettings(const std::string& network_id); | 58 void ShowNetworkSettings(const std::string& network_id); |
| 59 void ShowProxySettings(); | 59 void ShowProxySettings(); |
| 60 void SignOut(); |
| 61 void RequestRestartForUpdate(); |
| 60 | 62 |
| 61 // Binds the mojom::SystemTray interface to this object. | 63 // Binds the mojom::SystemTray interface to this object. |
| 62 void BindRequest(mojom::SystemTrayRequest request); | 64 void BindRequest(mojom::SystemTrayRequest request); |
| 63 | 65 |
| 64 private: | 66 private: |
| 65 // Connects or reconnects to the mojom::SystemTrayClient interface when | 67 // Connects or reconnects to the mojom::SystemTrayClient interface when |
| 66 // running on Chrome OS. Otherwise does nothing. Returns true if connected. | 68 // running on Chrome OS. Otherwise does nothing. Returns true if connected. |
| 67 bool ConnectToSystemTrayClient(); | 69 bool ConnectToSystemTrayClient(); |
| 68 | 70 |
| 69 // Handles errors on the |system_tray_client_| interface connection. | 71 // Handles errors on the |system_tray_client_| interface connection. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 83 | 85 |
| 84 // The type of clock hour display: 12 or 24 hour. | 86 // The type of clock hour display: 12 or 24 hour. |
| 85 base::HourClockType hour_clock_type_; | 87 base::HourClockType hour_clock_type_; |
| 86 | 88 |
| 87 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); | 89 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); |
| 88 }; | 90 }; |
| 89 | 91 |
| 90 } // namspace ash | 92 } // namspace ash |
| 91 | 93 |
| 92 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ | 94 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ |
| OLD | NEW |