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

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: Build fix 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 28 matching lines...) Expand all
39 #include "chrome/browser/extensions/extension_service.h" 39 #include "chrome/browser/extensions/extension_service.h"
40 #include "chrome/browser/extensions/extension_special_storage_policy.h" 40 #include "chrome/browser/extensions/extension_special_storage_policy.h"
41 #include "chrome/browser/extensions/extension_system.h" 41 #include "chrome/browser/extensions/extension_system.h"
42 #include "chrome/browser/extensions/user_script_master.h" 42 #include "chrome/browser/extensions/user_script_master.h"
43 #include "chrome/browser/favicon/favicon_service.h" 43 #include "chrome/browser/favicon/favicon_service.h"
44 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" 44 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
45 #include "chrome/browser/history/history.h" 45 #include "chrome/browser/history/history.h"
46 #include "chrome/browser/history/history_service_factory.h" 46 #include "chrome/browser/history/history_service_factory.h"
47 #include "chrome/browser/history/shortcuts_backend.h" 47 #include "chrome/browser/history/shortcuts_backend.h"
48 #include "chrome/browser/history/top_sites.h" 48 #include "chrome/browser/history/top_sites.h"
49 #include "chrome/browser/instant/instant_controller.h"
50 #include "chrome/browser/metrics/metrics_service.h" 49 #include "chrome/browser/metrics/metrics_service.h"
51 #include "chrome/browser/net/chrome_url_request_context.h" 50 #include "chrome/browser/net/chrome_url_request_context.h"
52 #include "chrome/browser/net/net_pref_observer.h" 51 #include "chrome/browser/net/net_pref_observer.h"
53 #include "chrome/browser/net/predictor.h" 52 #include "chrome/browser/net/predictor.h"
54 #include "chrome/browser/net/proxy_service_factory.h" 53 #include "chrome/browser/net/proxy_service_factory.h"
55 #include "chrome/browser/net/ssl_config_service_manager.h" 54 #include "chrome/browser/net/ssl_config_service_manager.h"
56 #include "chrome/browser/net/url_fixer_upper.h" 55 #include "chrome/browser/net/url_fixer_upper.h"
57 #include "chrome/browser/plugin_prefs.h" 56 #include "chrome/browser/plugin_prefs.h"
58 #include "chrome/browser/policy/policy_service.h" 57 #include "chrome/browser/policy/policy_service.h"
59 #include "chrome/browser/prefs/browser_prefs.h" 58 #include "chrome/browser/prefs/browser_prefs.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 bool init_background_mode_manager = true; 356 bool init_background_mode_manager = true;
358 #if defined(OS_CHROMEOS) 357 #if defined(OS_CHROMEOS)
359 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest)) 358 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
360 init_background_mode_manager = false; 359 init_background_mode_manager = false;
361 #endif 360 #endif
362 if (init_background_mode_manager) { 361 if (init_background_mode_manager) {
363 if (g_browser_process->background_mode_manager()) 362 if (g_browser_process->background_mode_manager())
364 g_browser_process->background_mode_manager()->RegisterProfile(this); 363 g_browser_process->background_mode_manager()->RegisterProfile(this);
365 } 364 }
366 365
367 InstantController::RecordMetrics(this);
368
369 FilePath cookie_path = GetPath(); 366 FilePath cookie_path = GetPath();
370 cookie_path = cookie_path.Append(chrome::kCookieFilename); 367 cookie_path = cookie_path.Append(chrome::kCookieFilename);
371 FilePath server_bound_cert_path = GetPath(); 368 FilePath server_bound_cert_path = GetPath();
372 server_bound_cert_path = 369 server_bound_cert_path =
373 server_bound_cert_path.Append(chrome::kOBCertFilename); 370 server_bound_cert_path.Append(chrome::kOBCertFilename);
374 FilePath cache_path = base_cache_path_; 371 FilePath cache_path = base_cache_path_;
375 int cache_max_size; 372 int cache_max_size;
376 GetCacheParameters(false, &cache_path, &cache_max_size); 373 GetCacheParameters(false, &cache_path, &cache_max_size);
377 cache_path = GetCachePath(cache_path); 374 cache_path = GetCachePath(cache_path);
378 375
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 if (!path.empty()) 1082 if (!path.empty())
1086 *cache_path = path; 1083 *cache_path = path;
1087 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1084 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1088 prefs_->GetInteger(prefs::kDiskCacheSize); 1085 prefs_->GetInteger(prefs::kDiskCacheSize);
1089 } 1086 }
1090 1087
1091 base::Callback<ChromeURLDataManagerBackend*(void)> 1088 base::Callback<ChromeURLDataManagerBackend*(void)>
1092 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1089 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1093 return io_data_.GetChromeURLDataManagerBackendGetter(); 1090 return io_data_.GetChromeURLDataManagerBackendGetter();
1094 } 1091 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698