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

Side by Side Diff: ash/common/system/tray/system_tray_controller.h

Issue 2754143006: cros: Convert SystemTrayDelegate::ManageBluetoothDevices to mojo for mash (Closed)
Patch Set: rebase Created 3 years, 9 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 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 15 matching lines...) Expand all
26 class ASH_EXPORT SystemTrayController 26 class ASH_EXPORT SystemTrayController
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();
37 // TODO(crbug.com/660043): ShowBluetoothPairingDialog() goes here.
36 void ShowDateSettings(); 38 void ShowDateSettings();
37 void ShowSetTimeDialog(); 39 void ShowSetTimeDialog();
38 void ShowDisplaySettings(); 40 void ShowDisplaySettings();
39 void ShowPowerSettings(); 41 void ShowPowerSettings();
40 void ShowChromeSlow(); 42 void ShowChromeSlow();
41 void ShowIMESettings(); 43 void ShowIMESettings();
42 void ShowHelp(); 44 void ShowHelp();
43 void ShowAccessibilityHelp(); 45 void ShowAccessibilityHelp();
44 void ShowAccessibilitySettings(); 46 void ShowAccessibilitySettings();
45 void ShowPaletteHelp(); 47 void ShowPaletteHelp();
(...skipping 12 matching lines...) Expand all
58 60
59 // mojom::SystemTray overrides. Public for testing. 61 // mojom::SystemTray overrides. Public for testing.
60 void SetClient(mojom::SystemTrayClientPtr client) override; 62 void SetClient(mojom::SystemTrayClientPtr client) override;
61 void SetPrimaryTrayEnabled(bool enabled) override; 63 void SetPrimaryTrayEnabled(bool enabled) override;
62 void SetPrimaryTrayVisible(bool visible) override; 64 void SetPrimaryTrayVisible(bool visible) override;
63 void SetUse24HourClock(bool use_24_hour) override; 65 void SetUse24HourClock(bool use_24_hour) override;
64 void ShowUpdateIcon(mojom::UpdateSeverity severity, 66 void ShowUpdateIcon(mojom::UpdateSeverity severity,
65 bool factory_reset_required) override; 67 bool factory_reset_required) override;
66 68
67 private: 69 private:
68 // Client interface in chrome browser. Only bound on Chrome OS. 70 // Client interface in chrome browser. May be null in tests.
69 mojom::SystemTrayClientPtr system_tray_client_; 71 mojom::SystemTrayClientPtr system_tray_client_;
70 72
71 // Bindings for the SystemTray interface. 73 // Bindings for the SystemTray interface.
72 mojo::BindingSet<mojom::SystemTray> bindings_; 74 mojo::BindingSet<mojom::SystemTray> bindings_;
73 75
74 // The type of clock hour display: 12 or 24 hour. 76 // The type of clock hour display: 12 or 24 hour.
75 base::HourClockType hour_clock_type_; 77 base::HourClockType hour_clock_type_;
76 78
77 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 79 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
78 }; 80 };
79 81
80 } // namspace ash 82 } // namspace ash
81 83
82 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 84 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/bluetooth/tray_bluetooth.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698