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

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

Issue 6461024: Revert 74292 - Splits ChromeURLDataManager into 2 chunks:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/remoting/setup_flow.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "chrome/browser/appcache/chrome_appcache_service.h" 16 #include "chrome/browser/appcache/chrome_appcache_service.h"
17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
18 #include "chrome/browser/autofill/personal_data_manager.h" 18 #include "chrome/browser/autofill/personal_data_manager.h"
19 #include "chrome/browser/background_contents_service.h" 19 #include "chrome/browser/background_contents_service.h"
20 #include "chrome/browser/background_mode_manager.h" 20 #include "chrome/browser/background_mode_manager.h"
21 #include "chrome/browser/bookmarks/bookmark_model.h" 21 #include "chrome/browser/bookmarks/bookmark_model.h"
22 #include "chrome/browser/browser_list.h" 22 #include "chrome/browser/browser_list.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/browser_signin.h" 24 #include "chrome/browser/browser_signin.h"
25 #include "chrome/browser/browser_thread.h" 25 #include "chrome/browser/browser_thread.h"
26 #include "chrome/browser/chrome_blob_storage_context.h" 26 #include "chrome/browser/chrome_blob_storage_context.h"
27 #include "chrome/browser/content_settings/host_content_settings_map.h" 27 #include "chrome/browser/content_settings/host_content_settings_map.h"
28 #include "chrome/browser/defaults.h" 28 #include "chrome/browser/defaults.h"
29 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
30 #include "chrome/browser/dom_ui/ntp_resource_cache.h" 29 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
31 #include "chrome/browser/download/download_manager.h" 30 #include "chrome/browser/download/download_manager.h"
32 #include "chrome/browser/extensions/default_apps.h" 31 #include "chrome/browser/extensions/default_apps.h"
33 #include "chrome/browser/extensions/extension_devtools_manager.h" 32 #include "chrome/browser/extensions/extension_devtools_manager.h"
34 #include "chrome/browser/extensions/extension_error_reporter.h" 33 #include "chrome/browser/extensions/extension_error_reporter.h"
35 #include "chrome/browser/extensions/extension_event_router.h" 34 #include "chrome/browser/extensions/extension_event_router.h"
36 #include "chrome/browser/extensions/extension_info_map.h" 35 #include "chrome/browser/extensions/extension_info_map.h"
37 #include "chrome/browser/extensions/extension_io_event_router.h" 36 #include "chrome/browser/extensions/extension_io_event_router.h"
38 #include "chrome/browser/extensions/extension_message_service.h" 37 #include "chrome/browser/extensions/extension_message_service.h"
39 #include "chrome/browser/extensions/extension_pref_store.h" 38 #include "chrome/browser/extensions/extension_pref_store.h"
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 return extension_info_map_.get(); 1365 return extension_info_map_.get();
1367 } 1366 }
1368 1367
1369 policy::ProfilePolicyContext* ProfileImpl::GetPolicyContext() { 1368 policy::ProfilePolicyContext* ProfileImpl::GetPolicyContext() {
1370 if (!profile_policy_context_.get()) 1369 if (!profile_policy_context_.get())
1371 profile_policy_context_.reset(new policy::ProfilePolicyContext(this)); 1370 profile_policy_context_.reset(new policy::ProfilePolicyContext(this));
1372 1371
1373 return profile_policy_context_.get(); 1372 return profile_policy_context_.get();
1374 } 1373 }
1375 1374
1376 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() {
1377 if (!chrome_url_data_manager_.get())
1378 chrome_url_data_manager_.reset(new ChromeURLDataManager(this));
1379 return chrome_url_data_manager_.get();
1380 }
1381
1382 PromoCounter* ProfileImpl::GetInstantPromoCounter() { 1375 PromoCounter* ProfileImpl::GetInstantPromoCounter() {
1383 #if defined(OS_WIN) 1376 #if defined(OS_WIN)
1384 // TODO: enable this when we're ready to turn on the promo. 1377 // TODO: enable this when we're ready to turn on the promo.
1385 /* 1378 /*
1386 if (!checked_instant_promo_) { 1379 if (!checked_instant_promo_) {
1387 checked_instant_promo_ = true; 1380 checked_instant_promo_ = true;
1388 PrefService* prefs = GetPrefs(); 1381 PrefService* prefs = GetPrefs();
1389 if (!prefs->GetBoolean(prefs::kInstantEnabledOnce) && 1382 if (!prefs->GetBoolean(prefs::kInstantEnabledOnce) &&
1390 !InstantController::IsEnabled(this) && 1383 !InstantController::IsEnabled(this) &&
1391 InstallUtil::IsChromeSxSProcess()) { 1384 InstallUtil::IsChromeSxSProcess()) {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 } 1493 }
1501 1494
1502 PrerenderManager* ProfileImpl::GetPrerenderManager() { 1495 PrerenderManager* ProfileImpl::GetPrerenderManager() {
1503 CommandLine* cl = CommandLine::ForCurrentProcess(); 1496 CommandLine* cl = CommandLine::ForCurrentProcess();
1504 if (!cl->HasSwitch(switches::kEnablePagePrerender)) 1497 if (!cl->HasSwitch(switches::kEnablePagePrerender))
1505 return NULL; 1498 return NULL;
1506 if (!prerender_manager_) 1499 if (!prerender_manager_)
1507 prerender_manager_ = new PrerenderManager(this); 1500 prerender_manager_ = new PrerenderManager(this);
1508 return prerender_manager_; 1501 return prerender_manager_;
1509 } 1502 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/remoting/setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698