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

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: Fixed several bot compile errors Created 6 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 <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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/profiles/gaia_info_update_service_factory.h" 60 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
61 #include "chrome/browser/profiles/profile_destroyer.h" 61 #include "chrome/browser/profiles/profile_destroyer.h"
62 #include "chrome/browser/profiles/profile_info_cache.h" 62 #include "chrome/browser/profiles/profile_info_cache.h"
63 #include "chrome/browser/profiles/profile_manager.h" 63 #include "chrome/browser/profiles/profile_manager.h"
64 #include "chrome/browser/profiles/profile_metrics.h" 64 #include "chrome/browser/profiles/profile_metrics.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/services/gcm/gcm_profile_service_factory.h" 67 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
68 #include "chrome/browser/services/gcm/push_messaging_service_impl.h" 68 #include "chrome/browser/services/gcm/push_messaging_service_impl.h"
69 #include "chrome/browser/sessions/session_service_factory.h" 69 #include "chrome/browser/sessions/session_service_factory.h"
70 #include "chrome/browser/ssl/chrome_ssl_host_state_decisions.h"
71 #include "chrome/browser/ssl/chrome_ssl_host_state_decisions_factory.h"
70 #include "chrome/browser/ui/startup/startup_browser_creator.h" 72 #include "chrome/browser/ui/startup/startup_browser_creator.h"
71 #include "chrome/common/chrome_constants.h" 73 #include "chrome/common/chrome_constants.h"
72 #include "chrome/common/chrome_paths_internal.h" 74 #include "chrome/common/chrome_paths_internal.h"
73 #include "chrome/common/chrome_switches.h" 75 #include "chrome/common/chrome_switches.h"
74 #include "chrome/common/chrome_version_info.h" 76 #include "chrome/common/chrome_version_info.h"
75 #include "chrome/common/pref_names.h" 77 #include "chrome/common/pref_names.h"
76 #include "chrome/common/url_constants.h" 78 #include "chrome/common/url_constants.h"
77 #include "components/bookmarks/browser/bookmark_model.h" 79 #include "components/bookmarks/browser/bookmark_model.h"
78 #include "components/dom_distiller/content/dom_distiller_viewer_source.h" 80 #include "components/dom_distiller/content/dom_distiller_viewer_source.h"
79 #include "components/dom_distiller/core/url_constants.h" 81 #include "components/dom_distiller/core/url_constants.h"
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 #else 1054 #else
1053 return NULL; 1055 return NULL;
1054 #endif 1056 #endif
1055 } 1057 }
1056 1058
1057 content::PushMessagingService* ProfileImpl::GetPushMessagingService() { 1059 content::PushMessagingService* ProfileImpl::GetPushMessagingService() {
1058 return gcm::GCMProfileServiceFactory::GetForProfile( 1060 return gcm::GCMProfileServiceFactory::GetForProfile(
1059 this)->push_messaging_service(); 1061 this)->push_messaging_service();
1060 } 1062 }
1061 1063
1064 content::SSLHostStateDecisions* ProfileImpl::GetSSLHostStateDecisions() {
1065 return ChromeSSLHostStateDecisionsFactory::GetForProfile(this);
1066 }
1067
1062 bool ProfileImpl::IsSameProfile(Profile* profile) { 1068 bool ProfileImpl::IsSameProfile(Profile* profile) {
1063 if (profile == static_cast<Profile*>(this)) 1069 if (profile == static_cast<Profile*>(this))
1064 return true; 1070 return true;
1065 Profile* otr_profile = off_the_record_profile_.get(); 1071 Profile* otr_profile = off_the_record_profile_.get();
1066 return otr_profile && profile == otr_profile; 1072 return otr_profile && profile == otr_profile;
1067 } 1073 }
1068 1074
1069 Time ProfileImpl::GetStartTime() const { 1075 Time ProfileImpl::GetStartTime() const {
1070 return start_time_; 1076 return start_time_;
1071 } 1077 }
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 ProfileImpl::CreateDomainReliabilityMonitor() { 1347 ProfileImpl::CreateDomainReliabilityMonitor() {
1342 domain_reliability::DomainReliabilityService* service = 1348 domain_reliability::DomainReliabilityService* service =
1343 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1349 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1344 GetForBrowserContext(this); 1350 GetForBrowserContext(this);
1345 if (!service) 1351 if (!service)
1346 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1352 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1347 1353
1348 return service->CreateMonitor( 1354 return service->CreateMonitor(
1349 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1355 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1350 } 1356 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698