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

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

Issue 1295323002: Remove profile-based per-host & default zoom level migration code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "chrome/browser/push_messaging/push_messaging_service_factory.h" 63 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
64 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" 64 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
65 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 65 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
66 #include "chrome/browser/services/gcm/gcm_profile_service.h" 66 #include "chrome/browser/services/gcm/gcm_profile_service.h"
67 #include "chrome/browser/sessions/session_service_factory.h" 67 #include "chrome/browser/sessions/session_service_factory.h"
68 #include "chrome/browser/signin/signin_manager_factory.h" 68 #include "chrome/browser/signin/signin_manager_factory.h"
69 #include "chrome/browser/signin/signin_ui_util.h" 69 #include "chrome/browser/signin/signin_ui_util.h"
70 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 70 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
71 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 71 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
72 #include "chrome/browser/ui/startup/startup_browser_creator.h" 72 #include "chrome/browser/ui/startup/startup_browser_creator.h"
73 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 73 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
gab 2015/08/18 20:39:40 rm this include
wjmaclean 2015/08/19 13:53:34 Done.
74 #include "chrome/common/chrome_constants.h" 74 #include "chrome/common/chrome_constants.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"
77 #include "chrome/common/pref_names.h" 77 #include "chrome/common/pref_names.h"
78 #include "chrome/common/url_constants.h" 78 #include "chrome/common/url_constants.h"
79 #include "chrome/grit/chromium_strings.h" 79 #include "chrome/grit/chromium_strings.h"
80 #include "components/bookmarks/browser/bookmark_model.h" 80 #include "components/bookmarks/browser/bookmark_model.h"
81 #include "components/content_settings/core/browser/cookie_settings.h" 81 #include "components/content_settings/core/browser/cookie_settings.h"
82 #include "components/content_settings/core/browser/host_content_settings_map.h" 82 #include "components/content_settings/core/browser/host_content_settings_map.h"
83 #include "components/domain_reliability/monitor.h" 83 #include "components/domain_reliability/monitor.h"
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 #if defined(ENABLE_PLUGINS) 608 #if defined(ENABLE_PLUGINS)
609 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( 609 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
610 PluginPrefs::GetForProfile(this).get(), 610 PluginPrefs::GetForProfile(this).get(),
611 io_data_.GetResourceContextNoInit()); 611 io_data_.GetResourceContextNoInit());
612 #endif 612 #endif
613 613
614 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); 614 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk");
615 content::BrowserContext::GetDefaultStoragePartition(this)-> 615 content::BrowserContext::GetDefaultStoragePartition(this)->
616 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); 616 GetDOMStorageContext()->SetSaveSessionStorageOnDisk();
617 617
618 // TODO(wjmaclean): Remove this. crbug.com/420643
619 chrome::MigrateProfileZoomLevelPrefs(this);
620
621 // The DomDistillerViewerSource is not a normal WebUI so it must be registered 618 // The DomDistillerViewerSource is not a normal WebUI so it must be registered
622 // as a URLDataSource early. 619 // as a URLDataSource early.
623 RegisterDomDistillerViewerSource(this); 620 RegisterDomDistillerViewerSource(this);
624 621
625 #if defined(OS_CHROMEOS) 622 #if defined(OS_CHROMEOS)
626 if (chromeos::UserSessionManager::GetInstance() 623 if (chromeos::UserSessionManager::GetInstance()
627 ->RestartToApplyPerSessionFlagsIfNeed(this, true)) { 624 ->RestartToApplyPerSessionFlagsIfNeed(this, true)) {
628 return; 625 return;
629 } 626 }
630 #endif 627 #endif
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1306 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1310 domain_reliability::DomainReliabilityService* service = 1307 domain_reliability::DomainReliabilityService* service =
1311 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1308 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1312 GetForBrowserContext(this); 1309 GetForBrowserContext(this);
1313 if (!service) 1310 if (!service)
1314 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1311 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1315 1312
1316 return service->CreateMonitor( 1313 return service->CreateMonitor(
1317 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1314 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1318 } 1315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698