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

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

Issue 6201005: Initial support for partitioning cookies for isolated apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 9 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_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/command_line.h" 10 #include "base/command_line.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 222
223 scoped_refptr<ChromeURLRequestContext> 223 scoped_refptr<ChromeURLRequestContext>
224 ProfileIOData::GetExtensionsRequestContext() const { 224 ProfileIOData::GetExtensionsRequestContext() const {
225 LazyInitialize(); 225 LazyInitialize();
226 scoped_refptr<ChromeURLRequestContext> context = 226 scoped_refptr<ChromeURLRequestContext> context =
227 AcquireExtensionsRequestContext(); 227 AcquireExtensionsRequestContext();
228 DCHECK(context); 228 DCHECK(context);
229 return context; 229 return context;
230 } 230 }
231 231
232 scoped_refptr<ChromeURLRequestContext>
233 ProfileIOData::GetIsolatedAppRequestContext(
234 scoped_refptr<ChromeURLRequestContext> main_context,
235 const std::string& app_id) const {
236 LazyInitialize();
237 scoped_refptr<ChromeURLRequestContext> context =
238 AcquireIsolatedAppRequestContext(main_context, app_id);
239 DCHECK(context);
240 return context;
241 }
242
232 void ProfileIOData::LazyInitialize() const { 243 void ProfileIOData::LazyInitialize() const {
233 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 244 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
234 if (initialized_) 245 if (initialized_)
235 return; 246 return;
236 LazyInitializeInternal(); 247 LazyInitializeInternal();
237 initialized_ = true; 248 initialized_ = true;
238 } 249 }
239 250
240 // static 251 // static
241 void ProfileIOData::ApplyProfileParamsToContext( 252 void ProfileIOData::ApplyProfileParamsToContext(
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 348
338 #if defined(OS_CHROMEOS) 349 #if defined(OS_CHROMEOS)
339 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { 350 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
340 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> 351 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->
341 RegisterNetworkProxyHandler(proxy_service); 352 RegisterNetworkProxyHandler(proxy_service);
342 } 353 }
343 #endif // defined(OS_CHROMEOS) 354 #endif // defined(OS_CHROMEOS)
344 355
345 return proxy_service; 356 return proxy_service;
346 } 357 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/renderer_host/browser_render_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698