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

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 10836031: Remove Instant v1 API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update history, title, favicon Created 8 years, 4 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/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 25 matching lines...) Expand all
36 #include "chrome/browser/extensions/extension_pref_value_map_factory.h" 36 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"
37 #include "chrome/browser/extensions/extension_process_manager.h" 37 #include "chrome/browser/extensions/extension_process_manager.h"
38 #include "chrome/browser/extensions/extension_service.h" 38 #include "chrome/browser/extensions/extension_service.h"
39 #include "chrome/browser/extensions/extension_special_storage_policy.h" 39 #include "chrome/browser/extensions/extension_special_storage_policy.h"
40 #include "chrome/browser/extensions/extension_system.h" 40 #include "chrome/browser/extensions/extension_system.h"
41 #include "chrome/browser/extensions/user_script_master.h" 41 #include "chrome/browser/extensions/user_script_master.h"
42 #include "chrome/browser/favicon/favicon_service.h" 42 #include "chrome/browser/favicon/favicon_service.h"
43 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" 43 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
44 #include "chrome/browser/history/shortcuts_backend.h" 44 #include "chrome/browser/history/shortcuts_backend.h"
45 #include "chrome/browser/history/top_sites.h" 45 #include "chrome/browser/history/top_sites.h"
46 #include "chrome/browser/instant/instant_controller.h"
47 #include "chrome/browser/metrics/metrics_service.h" 46 #include "chrome/browser/metrics/metrics_service.h"
48 #include "chrome/browser/net/chrome_url_request_context.h" 47 #include "chrome/browser/net/chrome_url_request_context.h"
49 #include "chrome/browser/net/net_pref_observer.h" 48 #include "chrome/browser/net/net_pref_observer.h"
50 #include "chrome/browser/net/predictor.h" 49 #include "chrome/browser/net/predictor.h"
51 #include "chrome/browser/net/proxy_service_factory.h" 50 #include "chrome/browser/net/proxy_service_factory.h"
52 #include "chrome/browser/net/ssl_config_service_manager.h" 51 #include "chrome/browser/net/ssl_config_service_manager.h"
53 #include "chrome/browser/net/url_fixer_upper.h" 52 #include "chrome/browser/net/url_fixer_upper.h"
54 #include "chrome/browser/plugin_prefs.h" 53 #include "chrome/browser/plugin_prefs.h"
55 #include "chrome/browser/policy/policy_service.h" 54 #include "chrome/browser/policy/policy_service.h"
56 #include "chrome/browser/policy/user_cloud_policy_manager.h" 55 #include "chrome/browser/policy/user_cloud_policy_manager.h"
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 bool init_background_mode_manager = true; 364 bool init_background_mode_manager = true;
366 #if defined(OS_CHROMEOS) 365 #if defined(OS_CHROMEOS)
367 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) 366 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
368 init_background_mode_manager = false; 367 init_background_mode_manager = false;
369 #endif 368 #endif
370 if (init_background_mode_manager) { 369 if (init_background_mode_manager) {
371 if (g_browser_process->background_mode_manager()) 370 if (g_browser_process->background_mode_manager())
372 g_browser_process->background_mode_manager()->RegisterProfile(this); 371 g_browser_process->background_mode_manager()->RegisterProfile(this);
373 } 372 }
374 373
375 InstantController::RecordMetrics(this);
376
377 FilePath cookie_path = GetPath(); 374 FilePath cookie_path = GetPath();
378 cookie_path = cookie_path.Append(chrome::kCookieFilename); 375 cookie_path = cookie_path.Append(chrome::kCookieFilename);
379 FilePath server_bound_cert_path = GetPath(); 376 FilePath server_bound_cert_path = GetPath();
380 server_bound_cert_path = 377 server_bound_cert_path =
381 server_bound_cert_path.Append(chrome::kOBCertFilename); 378 server_bound_cert_path.Append(chrome::kOBCertFilename);
382 FilePath cache_path = base_cache_path_; 379 FilePath cache_path = base_cache_path_;
383 int cache_max_size; 380 int cache_max_size;
384 GetCacheParameters(false, &cache_path, &cache_max_size); 381 GetCacheParameters(false, &cache_path, &cache_max_size);
385 cache_path = GetCachePath(cache_path); 382 cache_path = GetCachePath(cache_path);
386 383
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 if (!path.empty()) 1074 if (!path.empty())
1078 *cache_path = path; 1075 *cache_path = path;
1079 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1076 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1080 prefs_->GetInteger(prefs::kDiskCacheSize); 1077 prefs_->GetInteger(prefs::kDiskCacheSize);
1081 } 1078 }
1082 1079
1083 base::Callback<ChromeURLDataManagerBackend*(void)> 1080 base::Callback<ChromeURLDataManagerBackend*(void)>
1084 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1081 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1085 return io_data_.GetChromeURLDataManagerBackendGetter(); 1082 return io_data_.GetChromeURLDataManagerBackendGetter();
1086 } 1083 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698