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

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

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: 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/mus/manifest.json ('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 <memory> 8 #include <memory>
9 9
10 #include "ash/common/system/tray/default_system_tray_delegate.h" 10 #include "ash/common/system/tray/default_system_tray_delegate.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 class NetworkingConfigDelegate; 15 class NetworkingConfigDelegate;
16 class VPNDelegate;
16 17
17 // Handles the settings displayed in the system tray menu. For the classic ash 18 // Handles the settings displayed in the system tray menu. For the classic ash
18 // version see SystemTrayDelegateChromeOS. 19 // version see SystemTrayDelegateChromeOS.
19 // 20 //
20 // Chrome OS only. Other platforms use DefaultSystemTrayDelegate directly. 21 // Chrome OS only. Other platforms use DefaultSystemTrayDelegate directly.
21 // 22 //
22 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412. 23 // TODO: Support all methods in SystemTrayDelegate. http://crbug.com/647412.
23 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate { 24 class SystemTrayDelegateMus : public DefaultSystemTrayDelegate {
24 public: 25 public:
25 SystemTrayDelegateMus(); 26 SystemTrayDelegateMus();
26 ~SystemTrayDelegateMus() override; 27 ~SystemTrayDelegateMus() override;
27 28
28 private: 29 private:
29 // SystemTrayDelegate: 30 // SystemTrayDelegate:
30 NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 31 NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
32 VPNDelegate* GetVPNDelegate() const override;
31 33
32 std::unique_ptr<NetworkingConfigDelegate> networking_config_delegate_; 34 std::unique_ptr<NetworkingConfigDelegate> networking_config_delegate_;
35 std::unique_ptr<VPNDelegate> vpn_delegate_;
33 36
34 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus); 37 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateMus);
35 }; 38 };
36 39
37 } // namespace ash 40 } // namespace ash
38 41
39 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_ 42 #endif // ASH_MUS_SYSTEM_TRAY_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/manifest.json ('k') | ash/mus/system_tray_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698