| OLD | NEW |
| 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/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "chrome/browser/prerender/prerender_manager_factory.h" | 56 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 57 #include "chrome/browser/profiles/chrome_version_service.h" | 57 #include "chrome/browser/profiles/chrome_version_service.h" |
| 58 #include "chrome/browser/profiles/gaia_info_update_service.h" | 58 #include "chrome/browser/profiles/gaia_info_update_service.h" |
| 59 #include "chrome/browser/profiles/profile_dependency_manager.h" | 59 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 60 #include "chrome/browser/profiles/profile_info_cache.h" | 60 #include "chrome/browser/profiles/profile_info_cache.h" |
| 61 #include "chrome/browser/profiles/profile_manager.h" | 61 #include "chrome/browser/profiles/profile_manager.h" |
| 62 #include "chrome/browser/search_engines/template_url_fetcher.h" | 62 #include "chrome/browser/search_engines/template_url_fetcher.h" |
| 63 #include "chrome/browser/sessions/session_service_factory.h" | 63 #include "chrome/browser/sessions/session_service_factory.h" |
| 64 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" | 64 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" |
| 65 #include "chrome/browser/sync/profile_sync_service_factory.h" | 65 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 66 #include "chrome/browser/ui/browser_init.h" | 66 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 67 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 67 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
| 68 #include "chrome/browser/user_style_sheet_watcher.h" | 68 #include "chrome/browser/user_style_sheet_watcher.h" |
| 69 #include "chrome/browser/visitedlink/visitedlink_event_listener.h" | 69 #include "chrome/browser/visitedlink/visitedlink_event_listener.h" |
| 70 #include "chrome/browser/visitedlink/visitedlink_master.h" | 70 #include "chrome/browser/visitedlink/visitedlink_master.h" |
| 71 #include "chrome/browser/web_resource/promo_resource_service.h" | 71 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 72 #include "chrome/browser/webdata/web_data_service.h" | 72 #include "chrome/browser/webdata/web_data_service.h" |
| 73 #include "chrome/common/chrome_constants.h" | 73 #include "chrome/common/chrome_constants.h" |
| 74 #include "chrome/common/chrome_notification_types.h" | 74 #include "chrome/common/chrome_notification_types.h" |
| 75 #include "chrome/common/chrome_paths_internal.h" | 75 #include "chrome/common/chrome_paths_internal.h" |
| 76 #include "chrome/common/chrome_switches.h" | 76 #include "chrome/common/chrome_switches.h" |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 extensions_cookie_path = | 356 extensions_cookie_path = |
| 357 extensions_cookie_path.Append(chrome::kExtensionsCookieFilename); | 357 extensions_cookie_path.Append(chrome::kExtensionsCookieFilename); |
| 358 | 358 |
| 359 FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname); | 359 FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname); |
| 360 | 360 |
| 361 #if defined(OS_ANDROID) | 361 #if defined(OS_ANDROID) |
| 362 SessionStartupPref::Type startup_pref_type = | 362 SessionStartupPref::Type startup_pref_type = |
| 363 SessionStartupPref::GetDefaultStartupType(); | 363 SessionStartupPref::GetDefaultStartupType(); |
| 364 #else | 364 #else |
| 365 SessionStartupPref::Type startup_pref_type = | 365 SessionStartupPref::Type startup_pref_type = |
| 366 BrowserInit::GetSessionStartupPref(*CommandLine::ForCurrentProcess(), | 366 StartupBrowserCreator::GetSessionStartupPref( |
| 367 this).type; | 367 *CommandLine::ForCurrentProcess(), this).type; |
| 368 #endif | 368 #endif |
| 369 bool restore_old_session_cookies = | 369 bool restore_old_session_cookies = |
| 370 session_restore_enabled_ && | 370 session_restore_enabled_ && |
| 371 (!DidLastSessionExitCleanly() || | 371 (!DidLastSessionExitCleanly() || |
| 372 startup_pref_type == SessionStartupPref::LAST); | 372 startup_pref_type == SessionStartupPref::LAST); |
| 373 | 373 |
| 374 InitHostZoomMap(); | 374 InitHostZoomMap(); |
| 375 | 375 |
| 376 // Make sure we initialize the ProfileIOData after everything else has been | 376 // Make sure we initialize the ProfileIOData after everything else has been |
| 377 // initialized that we might be reading from the IO thread. | 377 // initialized that we might be reading from the IO thread. |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1174 if (!path.empty()) | 1174 if (!path.empty()) |
| 1175 *cache_path = path; | 1175 *cache_path = path; |
| 1176 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : | 1176 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : |
| 1177 prefs_->GetInteger(prefs::kDiskCacheSize); | 1177 prefs_->GetInteger(prefs::kDiskCacheSize); |
| 1178 } | 1178 } |
| 1179 | 1179 |
| 1180 base::Callback<ChromeURLDataManagerBackend*(void)> | 1180 base::Callback<ChromeURLDataManagerBackend*(void)> |
| 1181 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { | 1181 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { |
| 1182 return io_data_.GetChromeURLDataManagerBackendGetter(); | 1182 return io_data_.GetChromeURLDataManagerBackendGetter(); |
| 1183 } | 1183 } |
| OLD | NEW |