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

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

Issue 6598002: Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder (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
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.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 } 273 }
274 274
275 virtual ExtensionMessageService* GetExtensionMessageService() { 275 virtual ExtensionMessageService* GetExtensionMessageService() {
276 return GetOriginalProfile()->GetExtensionMessageService(); 276 return GetOriginalProfile()->GetExtensionMessageService();
277 } 277 }
278 278
279 virtual ExtensionEventRouter* GetExtensionEventRouter() { 279 virtual ExtensionEventRouter* GetExtensionEventRouter() {
280 return GetOriginalProfile()->GetExtensionEventRouter(); 280 return GetOriginalProfile()->GetExtensionEventRouter();
281 } 281 }
282 282
283 virtual ExtensionIOEventRouter* GetExtensionIOEventRouter() {
284 return GetOriginalProfile()->GetExtensionIOEventRouter();
285 }
286
287 virtual SSLHostState* GetSSLHostState() { 283 virtual SSLHostState* GetSSLHostState() {
288 if (!ssl_host_state_.get()) 284 if (!ssl_host_state_.get())
289 ssl_host_state_.reset(new SSLHostState()); 285 ssl_host_state_.reset(new SSLHostState());
290 286
291 DCHECK(ssl_host_state_->CalledOnValidThread()); 287 DCHECK(ssl_host_state_->CalledOnValidThread());
292 return ssl_host_state_.get(); 288 return ssl_host_state_.get();
293 } 289 }
294 290
295 virtual net::TransportSecurityState* GetTransportSecurityState() { 291 virtual net::TransportSecurityState* GetTransportSecurityState() {
296 if (!transport_security_state_.get()) 292 if (!transport_security_state_.get())
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 }; 759 };
764 #endif 760 #endif
765 761
766 Profile* Profile::CreateOffTheRecordProfile() { 762 Profile* Profile::CreateOffTheRecordProfile() {
767 #if defined(OS_CHROMEOS) 763 #if defined(OS_CHROMEOS)
768 if (Profile::IsGuestSession()) 764 if (Profile::IsGuestSession())
769 return new GuestSessionProfile(this); 765 return new GuestSessionProfile(this);
770 #endif 766 #endif
771 return new OffTheRecordProfileImpl(this); 767 return new OffTheRecordProfileImpl(this);
772 } 768 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698