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

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

Issue 2625473002: Connect Login UI to SystemTray (Closed)
Patch Set: nits Created 3 years, 11 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
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void ShowNetworkSettings(const std::string& network_id); 51 void ShowNetworkSettings(const std::string& network_id);
52 void ShowProxySettings(); 52 void ShowProxySettings();
53 void SignOut(); 53 void SignOut();
54 void RequestRestartForUpdate(); 54 void RequestRestartForUpdate();
55 55
56 // Binds the mojom::SystemTray interface to this object. 56 // Binds the mojom::SystemTray interface to this object.
57 void BindRequest(mojom::SystemTrayRequest request); 57 void BindRequest(mojom::SystemTrayRequest request);
58 58
59 // mojom::SystemTray overrides. Public for testing. 59 // mojom::SystemTray overrides. Public for testing.
60 void SetClient(mojom::SystemTrayClientPtr client) override; 60 void SetClient(mojom::SystemTrayClientPtr client) override;
61 void SetPrimaryTrayEnabled(bool enabled) override;
62 void SetPrimaryTrayVisible(bool visible) override;
61 void SetUse24HourClock(bool use_24_hour) override; 63 void SetUse24HourClock(bool use_24_hour) override;
62 void ShowUpdateIcon(mojom::UpdateSeverity severity, 64 void ShowUpdateIcon(mojom::UpdateSeverity severity,
63 bool factory_reset_required) override; 65 bool factory_reset_required) override;
64 66
65 private: 67 private:
66 // Client interface in chrome browser. Only bound on Chrome OS. 68 // Client interface in chrome browser. Only bound on Chrome OS.
67 mojom::SystemTrayClientPtr system_tray_client_; 69 mojom::SystemTrayClientPtr system_tray_client_;
68 70
69 // Bindings for the SystemTray interface. 71 // Bindings for the SystemTray interface.
70 mojo::BindingSet<mojom::SystemTray> bindings_; 72 mojo::BindingSet<mojom::SystemTray> bindings_;
71 73
72 // The type of clock hour display: 12 or 24 hour. 74 // The type of clock hour display: 12 or 24 hour.
73 base::HourClockType hour_clock_type_; 75 base::HourClockType hour_clock_type_;
74 76
75 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 77 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
76 }; 78 };
77 79
78 } // namspace ash 80 } // namspace ash
79 81
80 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 82 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698