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

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

Issue 20130002: Call crypto::InitializeTPMToken on the IO thread (Take 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 5 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.h" 5 #include "chrome/browser/chromeos/cros/network_library.h"
6 6
7 #include "base/chromeos/chromeos_version.h" 7 #include "base/chromeos/chromeos_version.h"
8 #include "base/i18n/icu_encoding_detection.h" 8 #include "base/i18n/icu_encoding_detection.h"
9 #include "base/i18n/icu_string_conversions.h" 9 #include "base/i18n/icu_string_conversions.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
11 #include "base/json/json_writer.h" // for debug output only. 11 #include "base/json/json_writer.h" // for debug output only.
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/utf_string_conversion_utils.h" 13 #include "base/strings/utf_string_conversion_utils.h"
14 #include "chrome/browser/chromeos/cros/native_network_constants.h" 14 #include "chrome/browser/chromeos/cros/native_network_constants.h"
15 #include "chrome/browser/chromeos/cros/native_network_parser.h" 15 #include "chrome/browser/chromeos/cros/native_network_parser.h"
16 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h" 16 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h"
17 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h" 17 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h"
18 #include "chrome/common/net/x509_certificate_model.h" 18 #include "chrome/common/net/x509_certificate_model.h"
19 #include "chromeos/network/cert_loader.h"
20 #include "chromeos/network/certificate_pattern.h" 19 #include "chromeos/network/certificate_pattern.h"
21 #include "chromeos/network/certificate_pattern_matcher.h" 20 #include "chromeos/network/certificate_pattern_matcher.h"
22 #include "chromeos/network/cros_network_functions.h" 21 #include "chromeos/network/cros_network_functions.h"
23 #include "chromeos/network/network_state_handler.h" 22 #include "chromeos/network/network_state_handler.h"
24 #include "chromeos/network/onc/onc_utils.h" 23 #include "chromeos/network/onc/onc_utils.h"
25 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
26 #include "grit/ash_strings.h" 25 #include "grit/ash_strings.h"
27 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
28 #include "net/base/url_util.h" 27 #include "net/base/url_util.h"
29 #include "third_party/cros_system_api/dbus/service_constants.h" 28 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 } 1386 }
1388 1387
1389 // static 1388 // static
1390 void NetworkLibrary::SetForTesting(NetworkLibrary* library) { 1389 void NetworkLibrary::SetForTesting(NetworkLibrary* library) {
1391 if (g_network_library) 1390 if (g_network_library)
1392 delete g_network_library; 1391 delete g_network_library;
1393 g_network_library = library; 1392 g_network_library = library;
1394 } 1393 }
1395 1394
1396 } // namespace chromeos 1395 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.cc ('k') | chrome/browser/chromeos/settings/device_settings_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698