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 "chrome/browser/net/http_server_properties_manager_factory.h" | 5 #include "chrome/browser/net/http_server_properties_manager_factory.h" |
6 | 6 |
7 #include "base/threading/thread_task_runner_handle.h" | 7 #include "base/threading/thread_task_runner_handle.h" |
8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
9 #include "components/pref_registry/pref_registry_syncable.h" | 9 #include "components/pref_registry/pref_registry_syncable.h" |
10 #include "components/prefs/pref_change_registrar.h" | 10 #include "components/prefs/pref_change_registrar.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 | 53 |
54 DISALLOW_COPY_AND_ASSIGN(PrefServiceAdapter); | 54 DISALLOW_COPY_AND_ASSIGN(PrefServiceAdapter); |
55 }; | 55 }; |
56 | 56 |
57 } // namespace | 57 } // namespace |
58 | 58 |
59 namespace chrome_browser_net { | 59 namespace chrome_browser_net { |
60 | 60 |
61 /* static */ | 61 /* static */ |
62 net::HttpServerPropertiesManager* | 62 net::HttpServerPropertiesManager* |
63 HttpServerPropertiesManagerFactory::CreateManager(PrefService* pref_service) { | 63 HttpServerPropertiesManagerFactory::CreateManager(PrefService* pref_service, |
| 64 net::NetLog* net_log) { |
64 using content::BrowserThread; | 65 using content::BrowserThread; |
65 return new net::HttpServerPropertiesManager( | 66 return new net::HttpServerPropertiesManager( |
66 new PrefServiceAdapter(pref_service), // Transfers ownership. | 67 new PrefServiceAdapter(pref_service), // Transfers ownership. |
67 base::ThreadTaskRunnerHandle::Get(), | 68 base::ThreadTaskRunnerHandle::Get(), |
68 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 69 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), net_log); |
69 } | 70 } |
70 | 71 |
71 /* static */ | 72 /* static */ |
72 void HttpServerPropertiesManagerFactory::RegisterProfilePrefs( | 73 void HttpServerPropertiesManagerFactory::RegisterProfilePrefs( |
73 user_prefs::PrefRegistrySyncable* registry) { | 74 user_prefs::PrefRegistrySyncable* registry) { |
74 registry->RegisterDictionaryPref(prefs::kHttpServerProperties); | 75 registry->RegisterDictionaryPref(prefs::kHttpServerProperties); |
75 } | 76 } |
76 | 77 |
77 } // namespace chrome_browser_net | 78 } // namespace chrome_browser_net |
OLD | NEW |