| 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 16 matching lines...) Expand all Loading... |
| 27 : NON_EXPORTED_BASE(public mojom::SystemTray) { | 27 : NON_EXPORTED_BASE(public mojom::SystemTray) { |
| 28 public: | 28 public: |
| 29 SystemTrayController(); | 29 SystemTrayController(); |
| 30 ~SystemTrayController() override; | 30 ~SystemTrayController() override; |
| 31 | 31 |
| 32 base::HourClockType hour_clock_type() const { return hour_clock_type_; } | 32 base::HourClockType hour_clock_type() const { return hour_clock_type_; } |
| 33 | 33 |
| 34 // Wrappers around the mojom::SystemTrayClient interface. | 34 // Wrappers around the mojom::SystemTrayClient interface. |
| 35 void ShowSettings(); | 35 void ShowSettings(); |
| 36 void ShowBluetoothSettings(); | 36 void ShowBluetoothSettings(); |
| 37 // TODO(crbug.com/660043): ShowBluetoothPairingDialog() goes here. | 37 void ShowBluetoothPairingDialog(const std::string& address, |
| 38 const base::string16& name_for_display, |
| 39 bool paired, |
| 40 bool connected); |
| 38 void ShowDateSettings(); | 41 void ShowDateSettings(); |
| 39 void ShowSetTimeDialog(); | 42 void ShowSetTimeDialog(); |
| 40 void ShowDisplaySettings(); | 43 void ShowDisplaySettings(); |
| 41 void ShowPowerSettings(); | 44 void ShowPowerSettings(); |
| 42 void ShowChromeSlow(); | 45 void ShowChromeSlow(); |
| 43 void ShowIMESettings(); | 46 void ShowIMESettings(); |
| 44 void ShowHelp(); | 47 void ShowHelp(); |
| 45 void ShowAccessibilityHelp(); | 48 void ShowAccessibilityHelp(); |
| 46 void ShowAccessibilitySettings(); | 49 void ShowAccessibilitySettings(); |
| 47 void ShowPaletteHelp(); | 50 void ShowPaletteHelp(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 75 | 78 |
| 76 // The type of clock hour display: 12 or 24 hour. | 79 // The type of clock hour display: 12 or 24 hour. |
| 77 base::HourClockType hour_clock_type_; | 80 base::HourClockType hour_clock_type_; |
| 78 | 81 |
| 79 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); | 82 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); |
| 80 }; | 83 }; |
| 81 | 84 |
| 82 } // namspace ash | 85 } // namspace ash |
| 83 | 86 |
| 84 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ | 87 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ |
| OLD | NEW |