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

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

Issue 2558043006: ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: fix gcc Created 4 years 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 | « ash/common/system/tray/system_tray.cc ('k') | 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void ShowNetworkCreate(const std::string& type); 49 void ShowNetworkCreate(const std::string& type);
50 void ShowThirdPartyVpnCreate(const std::string& extension_id); 50 void ShowThirdPartyVpnCreate(const std::string& extension_id);
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 private: 59 // mojom::SystemTray overrides. Public for testing.
60 // mojom::SystemTray:
61 void SetClient(mojom::SystemTrayClientPtr client) override; 60 void SetClient(mojom::SystemTrayClientPtr client) override;
62 void SetUse24HourClock(bool use_24_hour) override; 61 void SetUse24HourClock(bool use_24_hour) override;
62 void ShowUpdateIcon(mojom::UpdateSeverity severity,
63 bool factory_reset_required) override;
63 64
65 private:
64 // Client interface in chrome browser. Only bound on Chrome OS. 66 // Client interface in chrome browser. Only bound on Chrome OS.
65 mojom::SystemTrayClientPtr system_tray_client_; 67 mojom::SystemTrayClientPtr system_tray_client_;
66 68
67 // Bindings for the SystemTray interface. 69 // Bindings for the SystemTray interface.
68 mojo::BindingSet<mojom::SystemTray> bindings_; 70 mojo::BindingSet<mojom::SystemTray> bindings_;
69 71
70 // The type of clock hour display: 12 or 24 hour. 72 // The type of clock hour display: 12 or 24 hour.
71 base::HourClockType hour_clock_type_; 73 base::HourClockType hour_clock_type_;
72 74
73 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 75 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
74 }; 76 };
75 77
76 } // namspace ash 78 } // namspace ash
77 79
78 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 80 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray.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