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

Side by Side Diff: chrome/browser/chromeos/cros/network_library_impl_base.cc

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed clang errors. Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/cros/network_library_impl_base.h" 5 #include "chrome/browser/chromeos/cros/network_library_impl_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
10 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
11 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
12 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/string_util.h"
13 #include "chrome/browser/chromeos/cros/network_constants.h" 13 #include "chrome/browser/chromeos/cros/network_constants.h"
14 #include "chrome/browser/chromeos/login/user_manager.h" 14 #include "chrome/browser/chromeos/login/user_manager.h"
15 #include "chrome/browser/chromeos/net/onc_utils.h" 15 #include "chrome/browser/chromeos/net/onc_utils.h"
16 #include "chrome/browser/chromeos/network_login_observer.h" 16 #include "chrome/browser/chromeos/network_login_observer.h"
17 #include "chromeos/network/network_ui_data.h" 17 #include "chromeos/network/network_ui_data.h"
18 #include "chromeos/network/onc/onc_certificate_importer.h" 18 #include "chromeos/network/onc/onc_certificate_importer.h"
19 #include "chromeos/network/onc/onc_constants.h" 19 #include "chromeos/network/onc/onc_constants.h"
20 #include "chromeos/network/onc/onc_normalizer.h" 20 #include "chromeos/network/onc/onc_normalizer.h"
21 #include "chromeos/network/onc/onc_signature.h" 21 #include "chromeos/network/onc/onc_signature.h"
22 #include "chromeos/network/onc/onc_translator.h" 22 #include "chromeos/network/onc/onc_translator.h"
23 #include "chromeos/network/onc/onc_utils.h" 23 #include "chromeos/network/onc/onc_utils.h"
24 #include "chromeos/network/onc/onc_validator.h" 24 #include "chromeos/network/onc/onc_validator.h"
25 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
26 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. 26 #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN.
27 #include "grit/generated_resources.h"
28 #include "third_party/cros_system_api/dbus/service_constants.h" 27 #include "third_party/cros_system_api/dbus/service_constants.h"
29 #include "ui/base/l10n/l10n_util.h"
30 28
31 using content::BrowserThread; 29 using content::BrowserThread;
32 30
33 namespace chromeos { 31 namespace chromeos {
34 32
35 namespace { 33 namespace {
36 34
37 // Only send network change notifications to observers once every 50ms. 35 // Only send network change notifications to observers once every 50ms.
38 const int kNetworkNotifyDelayMs = 50; 36 const int kNetworkNotifyDelayMs = 50;
39 37
(...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 GetTpmInfo(); 1797 GetTpmInfo();
1800 return tpm_slot_; 1798 return tpm_slot_;
1801 } 1799 }
1802 1800
1803 const std::string& NetworkLibraryImplBase::GetTpmPin() { 1801 const std::string& NetworkLibraryImplBase::GetTpmPin() {
1804 GetTpmInfo(); 1802 GetTpmInfo();
1805 return tpm_pin_; 1803 return tpm_pin_;
1806 } 1804 }
1807 1805
1808 } // namespace chromeos 1806 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/cros/network_library_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698