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

Side by Side Diff: content/shell/shell_content_browser_client.cc

Issue 12286020: Replace FilePath with base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | media/base/test_data_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/shell/shell_content_browser_client.h" 5 #include "content/shell/shell_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ShellBrowserContextForBrowserContext(content_browser_context); 97 ShellBrowserContextForBrowserContext(content_browser_context);
98 return shell_browser_context->CreateRequestContext( 98 return shell_browser_context->CreateRequestContext(
99 blob_protocol_handler.Pass(), file_system_protocol_handler.Pass(), 99 blob_protocol_handler.Pass(), file_system_protocol_handler.Pass(),
100 developer_protocol_handler.Pass(), chrome_protocol_handler.Pass(), 100 developer_protocol_handler.Pass(), chrome_protocol_handler.Pass(),
101 chrome_devtools_protocol_handler.Pass()); 101 chrome_devtools_protocol_handler.Pass());
102 } 102 }
103 103
104 net::URLRequestContextGetter* 104 net::URLRequestContextGetter*
105 ShellContentBrowserClient::CreateRequestContextForStoragePartition( 105 ShellContentBrowserClient::CreateRequestContextForStoragePartition(
106 BrowserContext* content_browser_context, 106 BrowserContext* content_browser_context,
107 const FilePath& partition_path, 107 const base::FilePath& partition_path,
108 bool in_memory, 108 bool in_memory,
109 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 109 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
110 blob_protocol_handler, 110 blob_protocol_handler,
111 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 111 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
112 file_system_protocol_handler, 112 file_system_protocol_handler,
113 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 113 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
114 developer_protocol_handler, 114 developer_protocol_handler,
115 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 115 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
116 chrome_protocol_handler, 116 chrome_protocol_handler,
117 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 117 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 ShellBrowserContext* 200 ShellBrowserContext*
201 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 201 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
202 BrowserContext* content_browser_context) { 202 BrowserContext* content_browser_context) {
203 if (content_browser_context == browser_context()) 203 if (content_browser_context == browser_context())
204 return browser_context(); 204 return browser_context();
205 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 205 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
206 return off_the_record_browser_context(); 206 return off_the_record_browser_context();
207 } 207 }
208 208
209 } // namespace content 209 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | media/base/test_data_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698