OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile_impl.h" | 5 #include "chrome/browser/profile_impl.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
| 12 #include "base/histogram.h" |
12 #include "base/path_service.h" | 13 #include "base/path_service.h" |
13 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
14 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
15 #include "base/string_util.h" | 16 #include "base/string_util.h" |
16 #include "chrome/browser/appcache/chrome_appcache_service.h" | 17 #include "chrome/browser/appcache/chrome_appcache_service.h" |
17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
18 #include "chrome/browser/autofill/personal_data_manager.h" | 19 #include "chrome/browser/autofill/personal_data_manager.h" |
19 #include "chrome/browser/background_contents_service.h" | 20 #include "chrome/browser/background_contents_service.h" |
20 #include "chrome/browser/background_mode_manager.h" | 21 #include "chrome/browser/background_mode_manager.h" |
21 #include "chrome/browser/bookmarks/bookmark_model.h" | 22 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1301 #if defined(OS_CHROMEOS) | 1302 #if defined(OS_CHROMEOS) |
1302 chromeos::ProxyConfigServiceImpl* | 1303 chromeos::ProxyConfigServiceImpl* |
1303 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | 1304 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { |
1304 if (!chromeos_proxy_config_service_impl_) { | 1305 if (!chromeos_proxy_config_service_impl_) { |
1305 chromeos_proxy_config_service_impl_ = | 1306 chromeos_proxy_config_service_impl_ = |
1306 new chromeos::ProxyConfigServiceImpl(); | 1307 new chromeos::ProxyConfigServiceImpl(); |
1307 } | 1308 } |
1308 return chromeos_proxy_config_service_impl_; | 1309 return chromeos_proxy_config_service_impl_; |
1309 } | 1310 } |
1310 #endif // defined(OS_CHROMEOS) | 1311 #endif // defined(OS_CHROMEOS) |
OLD | NEW |