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

Side by Side Diff: ash/mus/system_tray_delegate_mus.h

Issue 2373863002: mustash: Connect ash system tray "show settings" items to chrome over mojo (Closed)
Patch Set: review comments Created 4 years, 2 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 | « ash/common/system/tray/system_tray_delegate.cc ('k') | ash/mus/system_tray_delegate_mus.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_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
6 #define ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ 6 #define ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
7 7
8 #include "ash/common/system/tray/default_system_tray_delegate.h" 8 #include "ash/common/system/tray/default_system_tray_delegate.h"
9 #include "ash/public/interfaces/system_tray.mojom.h" 9 #include "ash/public/interfaces/system_tray.mojom.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 12 matching lines...) Expand all
23 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412. 23 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412.
24 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate, 24 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate,
25 public mojom::SystemTray { 25 public mojom::SystemTray {
26 public: 26 public:
27 explicit SystemTrayDelegateMus(shell::Connector* connector); 27 explicit SystemTrayDelegateMus(shell::Connector* connector);
28 ~SystemTrayDelegateMus() override; 28 ~SystemTrayDelegateMus() override;
29 29
30 static SystemTrayDelegateMus* Get(); 30 static SystemTrayDelegateMus* Get();
31 31
32 private: 32 private:
33 // Connects or reconnects the |system_tray_client_| interface. 33 // Connects or reconnects to the mojom::SystemTrayClient interface and returns
34 void ConnectToSystemTrayClient(); 34 // the interface pointer.
35 mojom::SystemTrayClient* ConnectToSystemTrayClient();
35 36
36 // Handles errors on the |system_tray_client_| interface connection. 37 // Handles errors on the |system_tray_client_| interface connection.
37 void OnClientConnectionError(); 38 void OnClientConnectionError();
38 39
39 // SystemTrayDelegate: 40 // SystemTrayDelegate:
40 base::HourClockType GetHourClockType() const override; 41 base::HourClockType GetHourClockType() const override;
42 void ShowSettings() override;
41 void ShowDateSettings() override; 43 void ShowDateSettings() override;
44 void ShowNetworkSettingsForGuid(const std::string& guid) override;
45 void ShowDisplaySettings() override;
46 void ShowPowerSettings() override;
47 void ShowChromeSlow() override;
48 void ShowIMESettings() override;
49 void ShowHelp() override;
50 void ShowAccessibilityHelp() override;
51 void ShowAccessibilitySettings() override;
52 void ShowPaletteHelp() override;
53 void ShowPaletteSettings() override;
54 void ShowPublicAccountInfo() override;
55 void ShowEnterpriseInfo() override;
56 void ShowProxySettings() override;
42 57
43 // mojom::SystemTray: 58 // mojom::SystemTray:
44 void SetUse24HourClock(bool use_24_hour) override; 59 void SetUse24HourClock(bool use_24_hour) override;
45 60
46 // May be null in unit tests. 61 // May be null in unit tests.
47 shell::Connector* connector_; 62 shell::Connector* connector_;
48 63
49 // Client interface in chrome browser. 64 // Client interface in chrome browser.
50 mojom::SystemTrayClientPtr system_tray_client_; 65 mojom::SystemTrayClientPtr system_tray_client_;
51 66
52 // 12 or 24 hour display. 67 // 12 or 24 hour display.
53 base::HourClockType hour_clock_type_; 68 base::HourClockType hour_clock_type_;
54 69
55 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus); 70 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus);
56 }; 71 };
57 72
58 } // namespace ash 73 } // namespace ash
59 74
60 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ 75 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_delegate.cc ('k') | ash/mus/system_tray_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698