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

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

Issue 10823212: Relanding this as this did not fix the chromiumos breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/signin/signin_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 context = app_request_context_map_[app_id]; 353 context = app_request_context_map_[app_id];
354 } else { 354 } else {
355 context = AcquireIsolatedAppRequestContext(main_context, app_id); 355 context = AcquireIsolatedAppRequestContext(main_context, app_id);
356 app_request_context_map_[app_id] = context; 356 app_request_context_map_[app_id] = context;
357 } 357 }
358 DCHECK(context); 358 DCHECK(context);
359 return context; 359 return context;
360 } 360 }
361 361
362 ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const { 362 ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
363 DCHECK(extension_info_map_) << "ExtensionSystem not initialized";
363 return extension_info_map_; 364 return extension_info_map_;
364 } 365 }
365 366
366 CookieSettings* ProfileIOData::GetCookieSettings() const { 367 CookieSettings* ProfileIOData::GetCookieSettings() const {
367 return cookie_settings_; 368 return cookie_settings_;
368 } 369 }
369 370
370 #if defined(ENABLE_NOTIFICATIONS) 371 #if defined(ENABLE_NOTIFICATIONS)
371 DesktopNotificationService* ProfileIOData::GetNotificationService() const { 372 DesktopNotificationService* ProfileIOData::GetNotificationService() const {
372 return notification_service_; 373 return notification_service_;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 } 600 }
600 601
601 void ProfileIOData::set_server_bound_cert_service( 602 void ProfileIOData::set_server_bound_cert_service(
602 net::ServerBoundCertService* server_bound_cert_service) const { 603 net::ServerBoundCertService* server_bound_cert_service) const {
603 server_bound_cert_service_.reset(server_bound_cert_service); 604 server_bound_cert_service_.reset(server_bound_cert_service);
604 } 605 }
605 606
606 void ProfileIOData::DestroyResourceContext() { 607 void ProfileIOData::DestroyResourceContext() {
607 resource_context_.reset(); 608 resource_context_.reset();
608 } 609 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/signin/signin_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698