OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/api/vpn_provider/vpn_service.h" | 5 #include "extensions/browser/api/vpn_provider/vpn_service.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/guid.h" | 12 #include "base/guid.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/macros.h" |
15 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
16 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
17 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
19 #include "base/values.h" | 20 #include "base/values.h" |
20 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" | 21 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" |
21 #include "chromeos/dbus/shill_third_party_vpn_observer.h" | 22 #include "chromeos/dbus/shill_third_party_vpn_observer.h" |
22 #include "chromeos/network/network_configuration_handler.h" | 23 #include "chromeos/network/network_configuration_handler.h" |
23 #include "chromeos/network/network_profile.h" | 24 #include "chromeos/network/network_profile.h" |
24 #include "chromeos/network/network_profile_handler.h" | 25 #include "chromeos/network/network_profile_handler.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 delete configuration; | 562 delete configuration; |
562 } | 563 } |
563 | 564 |
564 bool VpnService::DoesActiveConfigurationExistAndIsAccessAuthorized( | 565 bool VpnService::DoesActiveConfigurationExistAndIsAccessAuthorized( |
565 const std::string& extension_id) { | 566 const std::string& extension_id) { |
566 return active_configuration_ && | 567 return active_configuration_ && |
567 active_configuration_->extension_id() == extension_id; | 568 active_configuration_->extension_id() == extension_id; |
568 } | 569 } |
569 | 570 |
570 } // namespace chromeos | 571 } // namespace chromeos |
OLD | NEW |