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

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

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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/renderer/webkit_test_runner.cc ('k') | content/shell/webkit_test_controller.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/notification_service.h" 10 #include "content/public/browser/notification_service.h"
(...skipping 10 matching lines...) Expand all
21 #include "content/shell/shell.h" 21 #include "content/shell/shell.h"
22 #include "content/shell/shell_browser_context.h" 22 #include "content/shell/shell_browser_context.h"
23 #include "content/shell/shell_browser_main_parts.h" 23 #include "content/shell/shell_browser_main_parts.h"
24 #include "content/shell/shell_devtools_delegate.h" 24 #include "content/shell/shell_devtools_delegate.h"
25 #include "content/shell/shell_message_filter.h" 25 #include "content/shell/shell_message_filter.h"
26 #include "content/shell/shell_quota_permission_context.h" 26 #include "content/shell/shell_quota_permission_context.h"
27 #include "content/shell/shell_resource_dispatcher_host_delegate.h" 27 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
28 #include "content/shell/shell_web_contents_view_delegate_creator.h" 28 #include "content/shell/shell_web_contents_view_delegate_creator.h"
29 #include "content/shell/webkit_test_controller.h" 29 #include "content/shell/webkit_test_controller.h"
30 #include "googleurl/src/gurl.h" 30 #include "googleurl/src/gurl.h"
31 #include "webkit/glue/webpreferences.h" 31 #include "webkit/common/webpreferences.h"
32 32
33 #if defined(OS_ANDROID) 33 #if defined(OS_ANDROID)
34 #include "base/android/path_utils.h" 34 #include "base/android/path_utils.h"
35 #include "base/path_service.h" 35 #include "base/path_service.h"
36 #include "base/platform_file.h" 36 #include "base/platform_file.h"
37 #include "content/shell/android/shell_descriptors.h" 37 #include "content/shell/android/shell_descriptors.h"
38 #endif 38 #endif
39 39
40 namespace content { 40 namespace content {
41 41
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 ShellBrowserContext* 258 ShellBrowserContext*
259 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 259 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
260 BrowserContext* content_browser_context) { 260 BrowserContext* content_browser_context) {
261 if (content_browser_context == browser_context()) 261 if (content_browser_context == browser_context())
262 return browser_context(); 262 return browser_context();
263 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 263 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
264 return off_the_record_browser_context(); 264 return off_the_record_browser_context();
265 } 265 }
266 266
267 } // namespace content 267 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/webkit_test_runner.cc ('k') | content/shell/webkit_test_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698