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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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_browser_main_parts.cc ('k') | content/shell/shell_layout_tests_android.cc » ('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_net_log.h" 26 #include "content/shell/shell_net_log.h"
27 #include "content/shell/shell_quota_permission_context.h" 27 #include "content/shell/shell_quota_permission_context.h"
28 #include "content/shell/shell_resource_dispatcher_host_delegate.h" 28 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
29 #include "content/shell/shell_web_contents_view_delegate_creator.h" 29 #include "content/shell/shell_web_contents_view_delegate_creator.h"
30 #include "content/shell/webkit_test_controller.h" 30 #include "content/shell/webkit_test_controller.h"
31 #include "googleurl/src/gurl.h" 31 #include "url/gurl.h"
32 #include "webkit/common/webpreferences.h" 32 #include "webkit/common/webpreferences.h"
33 33
34 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
35 #include "base/android/path_utils.h" 35 #include "base/android/path_utils.h"
36 #include "base/path_service.h" 36 #include "base/path_service.h"
37 #include "base/platform_file.h" 37 #include "base/platform_file.h"
38 #include "content/shell/android/shell_descriptors.h" 38 #include "content/shell/android/shell_descriptors.h"
39 #endif 39 #endif
40 40
41 namespace content { 41 namespace content {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 ShellBrowserContext* 263 ShellBrowserContext*
264 ShellContentBrowserClient::ShellBrowserContextForBrowserContext( 264 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
265 BrowserContext* content_browser_context) { 265 BrowserContext* content_browser_context) {
266 if (content_browser_context == browser_context()) 266 if (content_browser_context == browser_context())
267 return browser_context(); 267 return browser_context();
268 DCHECK_EQ(content_browser_context, off_the_record_browser_context()); 268 DCHECK_EQ(content_browser_context, off_the_record_browser_context());
269 return off_the_record_browser_context(); 269 return off_the_record_browser_context();
270 } 270 }
271 271
272 } // namespace content 272 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main_parts.cc ('k') | content/shell/shell_layout_tests_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698