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

Side by Side Diff: ash/system/chromeos/network/vpn_delegate.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/system/chromeos/network/vpn_delegate.h" 5 #include "ash/system/chromeos/network/vpn_delegate.h"
6 6
7 #include "chromeos/network/network_state.h" 7 #include "chromeos/network/network_state.h"
8 #include "third_party/cros_system_api/dbus/service_constants.h" 8 #include "third_party/cros_system_api/dbus/service_constants.h"
9 9
10 namespace ash { 10 namespace ash {
11 11
12 VPNProvider::Key::Key() : third_party(false) { 12 VPNProvider::Key::Key() : third_party(false) {}
13 }
14 13
15 VPNProvider::Key::Key(const std::string& extension_id) 14 VPNProvider::Key::Key(const std::string& extension_id)
16 : third_party(true), extension_id(extension_id) { 15 : third_party(true), extension_id(extension_id) {}
17 }
18 16
19 bool VPNProvider::Key::operator==(const Key& other) const { 17 bool VPNProvider::Key::operator==(const Key& other) const {
20 return other.third_party == third_party && other.extension_id == extension_id; 18 return other.third_party == third_party && other.extension_id == extension_id;
21 } 19 }
22 20
23 bool VPNProvider::Key::MatchesNetwork( 21 bool VPNProvider::Key::MatchesNetwork(
24 const chromeos::NetworkState& network) const { 22 const chromeos::NetworkState& network) const {
25 if (network.type() != shill::kTypeVPN) 23 if (network.type() != shill::kTypeVPN)
26 return false; 24 return false;
27 const bool network_uses_third_party_provider = 25 const bool network_uses_third_party_provider =
28 network.vpn_provider_type() == shill::kProviderThirdPartyVpn; 26 network.vpn_provider_type() == shill::kProviderThirdPartyVpn;
29 if (!third_party) 27 if (!third_party)
30 return !network_uses_third_party_provider; 28 return !network_uses_third_party_provider;
31 return network_uses_third_party_provider && 29 return network_uses_third_party_provider &&
32 network.third_party_vpn_provider_extension_id() == extension_id; 30 network.third_party_vpn_provider_extension_id() == extension_id;
33 } 31 }
34 32
35 VPNProvider::VPNProvider(const Key& key, const std::string& name) 33 VPNProvider::VPNProvider(const Key& key, const std::string& name)
36 : key(key), name(name) { 34 : key(key), name(name) {}
37 }
38 35
39 VPNDelegate::Observer::~Observer() { 36 VPNDelegate::Observer::~Observer() {}
40 }
41 37
42 VPNDelegate::VPNDelegate() { 38 VPNDelegate::VPNDelegate() {}
43 }
44 39
45 VPNDelegate::~VPNDelegate() { 40 VPNDelegate::~VPNDelegate() {}
46 }
47 41
48 void VPNDelegate::AddObserver(Observer* observer) { 42 void VPNDelegate::AddObserver(Observer* observer) {
49 observer_list_.AddObserver(observer); 43 observer_list_.AddObserver(observer);
50 } 44 }
51 45
52 void VPNDelegate::RemoveObserver(Observer* observer) { 46 void VPNDelegate::RemoveObserver(Observer* observer) {
53 observer_list_.RemoveObserver(observer); 47 observer_list_.RemoveObserver(observer);
54 } 48 }
55 49
56 void VPNDelegate::NotifyObservers() { 50 void VPNDelegate::NotifyObservers() {
57 FOR_EACH_OBSERVER(Observer, observer_list_, OnVPNProvidersChanged()); 51 FOR_EACH_OBSERVER(Observer, observer_list_, OnVPNProvidersChanged());
58 } 52 }
59 53
60 } // namespace ash 54 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/tray_vpn.cc ('k') | ash/system/chromeos/power/power_event_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698