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

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

Issue 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes from felt plus new incognito browser tests Created 6 years, 5 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 <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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/profiles/profile_destroyer.h" 64 #include "chrome/browser/profiles/profile_destroyer.h"
65 #include "chrome/browser/profiles/profile_info_cache.h" 65 #include "chrome/browser/profiles/profile_info_cache.h"
66 #include "chrome/browser/profiles/profile_manager.h" 66 #include "chrome/browser/profiles/profile_manager.h"
67 #include "chrome/browser/profiles/profile_metrics.h" 67 #include "chrome/browser/profiles/profile_metrics.h"
68 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 68 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
69 #include "chrome/browser/search_engines/template_url_fetcher.h" 69 #include "chrome/browser/search_engines/template_url_fetcher.h"
70 #include "chrome/browser/services/gcm/gcm_profile_service.h" 70 #include "chrome/browser/services/gcm/gcm_profile_service.h"
71 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" 71 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
72 #include "chrome/browser/services/gcm/push_messaging_service_impl.h" 72 #include "chrome/browser/services/gcm/push_messaging_service_impl.h"
73 #include "chrome/browser/sessions/session_service_factory.h" 73 #include "chrome/browser/sessions/session_service_factory.h"
74 #include "chrome/browser/ssl/chrome_ssl_host_state_decisions.h"
75 #include "chrome/browser/ssl/chrome_ssl_host_state_decisions_factory.h"
74 #include "chrome/browser/ui/startup/startup_browser_creator.h" 76 #include "chrome/browser/ui/startup/startup_browser_creator.h"
75 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 77 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
76 #include "chrome/browser/webdata/web_data_service.h" 78 #include "chrome/browser/webdata/web_data_service.h"
77 #include "chrome/common/chrome_constants.h" 79 #include "chrome/common/chrome_constants.h"
78 #include "chrome/common/chrome_paths_internal.h" 80 #include "chrome/common/chrome_paths_internal.h"
79 #include "chrome/common/chrome_switches.h" 81 #include "chrome/common/chrome_switches.h"
80 #include "chrome/common/chrome_version_info.h" 82 #include "chrome/common/chrome_version_info.h"
81 #include "chrome/common/pref_names.h" 83 #include "chrome/common/pref_names.h"
82 #include "chrome/common/url_constants.h" 84 #include "chrome/common/url_constants.h"
83 #include "components/bookmarks/browser/bookmark_model.h" 85 #include "components/bookmarks/browser/bookmark_model.h"
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 1034
1033 quota::SpecialStoragePolicy* ProfileImpl::GetSpecialStoragePolicy() { 1035 quota::SpecialStoragePolicy* ProfileImpl::GetSpecialStoragePolicy() {
1034 return GetExtensionSpecialStoragePolicy(); 1036 return GetExtensionSpecialStoragePolicy();
1035 } 1037 }
1036 1038
1037 content::PushMessagingService* ProfileImpl::GetPushMessagingService() { 1039 content::PushMessagingService* ProfileImpl::GetPushMessagingService() {
1038 return gcm::GCMProfileServiceFactory::GetForProfile( 1040 return gcm::GCMProfileServiceFactory::GetForProfile(
1039 this)->push_messaging_service(); 1041 this)->push_messaging_service();
1040 } 1042 }
1041 1043
1044 content::SSLHostStateDecisions* ProfileImpl::GetSSLHostStateDecisions() {
1045 return ChromeSSLHostStateDecisionsFactory::GetForProfile(this);
1046 }
1047
1042 bool ProfileImpl::IsSameProfile(Profile* profile) { 1048 bool ProfileImpl::IsSameProfile(Profile* profile) {
1043 if (profile == static_cast<Profile*>(this)) 1049 if (profile == static_cast<Profile*>(this))
1044 return true; 1050 return true;
1045 Profile* otr_profile = off_the_record_profile_.get(); 1051 Profile* otr_profile = off_the_record_profile_.get();
1046 return otr_profile && profile == otr_profile; 1052 return otr_profile && profile == otr_profile;
1047 } 1053 }
1048 1054
1049 Time ProfileImpl::GetStartTime() const { 1055 Time ProfileImpl::GetStartTime() const {
1050 return start_time_; 1056 return start_time_;
1051 } 1057 }
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 ProfileImpl::CreateDomainReliabilityMonitor() { 1329 ProfileImpl::CreateDomainReliabilityMonitor() {
1324 domain_reliability::DomainReliabilityService* service = 1330 domain_reliability::DomainReliabilityService* service =
1325 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1331 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1326 GetForBrowserContext(this); 1332 GetForBrowserContext(this);
1327 if (!service) 1333 if (!service)
1328 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1334 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1329 1335
1330 return service->CreateMonitor( 1336 return service->CreateMonitor(
1331 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1337 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1332 } 1338 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698