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

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

Issue 2513673004: Reland: chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: fix manifest for reland Created 4 years, 1 month 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/system_tray_delegate_mus.h ('k') | ash/mus/vpn_delegate_mus.h » ('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 #include "ash/mus/system_tray_delegate_mus.h" 5 #include "ash/mus/system_tray_delegate_mus.h"
6 6
7 #include "ash/common/system/networking_config_delegate.h" 7 #include "ash/common/system/networking_config_delegate.h"
8 #include "ash/mus/vpn_delegate_mus.h"
9 8
10 namespace ash { 9 namespace ash {
11 namespace { 10 namespace {
12 11
13 // TODO(mash): Provide a real implementation, perhaps by folding its behavior 12 // TODO(mash): Provide a real implementation, perhaps by folding its behavior
14 // into an ash-side network information cache. http://crbug.com/651157 13 // into an ash-side network information cache. http://crbug.com/651157
15 class StubNetworkingConfigDelegate : public NetworkingConfigDelegate { 14 class StubNetworkingConfigDelegate : public NetworkingConfigDelegate {
16 public: 15 public:
17 StubNetworkingConfigDelegate() {} 16 StubNetworkingConfigDelegate() {}
18 ~StubNetworkingConfigDelegate() override {} 17 ~StubNetworkingConfigDelegate() override {}
19 18
20 private: 19 private:
21 // NetworkingConfigDelegate: 20 // NetworkingConfigDelegate:
22 std::unique_ptr<const ExtensionInfo> LookUpExtensionForNetwork( 21 std::unique_ptr<const ExtensionInfo> LookUpExtensionForNetwork(
23 const std::string& service_path) override { 22 const std::string& service_path) override {
24 return nullptr; 23 return nullptr;
25 } 24 }
26 25
27 DISALLOW_COPY_AND_ASSIGN(StubNetworkingConfigDelegate); 26 DISALLOW_COPY_AND_ASSIGN(StubNetworkingConfigDelegate);
28 }; 27 };
29 28
30 } // namespace 29 } // namespace
31 30
32 SystemTrayDelegateMus::SystemTrayDelegateMus() 31 SystemTrayDelegateMus::SystemTrayDelegateMus()
33 : networking_config_delegate_(new StubNetworkingConfigDelegate), 32 : networking_config_delegate_(new StubNetworkingConfigDelegate) {}
34 vpn_delegate_(new VPNDelegateMus) {}
35 33
36 SystemTrayDelegateMus::~SystemTrayDelegateMus() { 34 SystemTrayDelegateMus::~SystemTrayDelegateMus() {
37 } 35 }
38 36
39 NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate() 37 NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate()
40 const { 38 const {
41 return networking_config_delegate_.get(); 39 return networking_config_delegate_.get();
42 } 40 }
43 41
44 VPNDelegate* SystemTrayDelegateMus::GetVPNDelegate() const {
45 return vpn_delegate_.get();
46 }
47
48 } // namespace ash 42 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/system_tray_delegate_mus.h ('k') | ash/mus/vpn_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698