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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | « content/shell/browser/shell_content_browser_client.h ('k') | content/shell/browser/shell_devtools_delegate.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/browser/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/notification_service.h" 10 #include "content/public/browser/notification_service.h"
11 #include "content/public/browser/notification_types.h" 11 #include "content/public/browser/notification_types.h"
12 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
13 #include "content/public/browser/resource_dispatcher_host.h" 13 #include "content/public/browser/resource_dispatcher_host.h"
14 #include "content/public/browser/storage_partition.h" 14 #include "content/public/browser/storage_partition.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
17 #include "content/shell/browser/shell.h"
18 #include "content/shell/browser/shell_browser_context.h"
19 #include "content/shell/browser/shell_browser_main_parts.h"
20 #include "content/shell/browser/shell_devtools_delegate.h"
21 #include "content/shell/browser/shell_message_filter.h"
22 #include "content/shell/browser/shell_net_log.h"
23 #include "content/shell/browser/shell_quota_permission_context.h"
24 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
25 #include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
26 #include "content/shell/browser/webkit_test_controller.h"
17 #include "content/shell/common/shell_messages.h" 27 #include "content/shell/common/shell_messages.h"
18 #include "content/shell/common/shell_switches.h" 28 #include "content/shell/common/shell_switches.h"
19 #include "content/shell/common/webkit_test_helpers.h" 29 #include "content/shell/common/webkit_test_helpers.h"
20 #include "content/shell/geolocation/shell_access_token_store.h" 30 #include "content/shell/geolocation/shell_access_token_store.h"
21 #include "content/shell/shell.h"
22 #include "content/shell/shell_browser_context.h"
23 #include "content/shell/shell_browser_main_parts.h"
24 #include "content/shell/shell_devtools_delegate.h"
25 #include "content/shell/shell_message_filter.h"
26 #include "content/shell/shell_net_log.h"
27 #include "content/shell/shell_quota_permission_context.h"
28 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
29 #include "content/shell/shell_web_contents_view_delegate_creator.h"
30 #include "content/shell/webkit_test_controller.h"
31 #include "net/url_request/url_request_context_getter.h" 31 #include "net/url_request/url_request_context_getter.h"
32 #include "url/gurl.h" 32 #include "url/gurl.h"
33 #include "webkit/common/webpreferences.h" 33 #include "webkit/common/webpreferences.h"
34 34
35 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 #include "base/android/path_utils.h" 36 #include "base/android/path_utils.h"
37 #include "base/path_service.h" 37 #include "base/path_service.h"
38 #include "base/platform_file.h" 38 #include "base/platform_file.h"
39 #include "content/shell/android/shell_descriptors.h" 39 #include "content/shell/android/shell_descriptors.h"
40 #endif 40 #endif
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 ShellBrowserContext* 266 ShellBrowserContext*
267 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 267 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
268 BrowserContext* content_browser_context) { 268 BrowserContext* content_browser_context) {
269 if (content_browser_context == browser_context()) 269 if (content_browser_context == browser_context())
270 return browser_context(); 270 return browser_context();
271 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 271 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
272 return off_the_record_browser_context(); 272 return off_the_record_browser_context();
273 } 273 }
274 274
275 } // namespace content 275 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | content/shell/browser/shell_devtools_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698