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

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

Issue 10860037: [content shell] rename layout_test_controller{,_host,_bindings}.* to webkit_test_runner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 8 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/shell_browser_main.cc ('k') | content/shell/shell_content_renderer_client.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_path.h" 8 #include "base/file_path.h"
9 #include "content/public/browser/resource_dispatcher_host.h" 9 #include "content/public/browser/resource_dispatcher_host.h"
10 #include "content/shell/geolocation/shell_access_token_store.h" 10 #include "content/shell/geolocation/shell_access_token_store.h"
11 #include "content/shell/layout_test_controller_host.h"
12 #include "content/shell/shell.h" 11 #include "content/shell/shell.h"
13 #include "content/shell/shell_browser_context.h" 12 #include "content/shell/shell_browser_context.h"
14 #include "content/shell/shell_browser_main_parts.h" 13 #include "content/shell/shell_browser_main_parts.h"
15 #include "content/shell/shell_devtools_delegate.h" 14 #include "content/shell/shell_devtools_delegate.h"
16 #include "content/shell/shell_resource_dispatcher_host_delegate.h" 15 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
17 #include "content/shell/shell_switches.h" 16 #include "content/shell/shell_switches.h"
17 #include "content/shell/webkit_test_runner_host.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 19
20 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
21 #include "base/android/path_utils.h" 21 #include "base/android/path_utils.h"
22 #include "base/path_service.h" 22 #include "base/path_service.h"
23 #include "base/platform_file.h" 23 #include "base/platform_file.h"
24 #include "content/shell/android/shell_descriptors.h" 24 #include "content/shell/android/shell_descriptors.h"
25 #endif 25 #endif
26 26
27 namespace content { 27 namespace content {
28 28
29 ShellContentBrowserClient::ShellContentBrowserClient() 29 ShellContentBrowserClient::ShellContentBrowserClient()
30 : shell_browser_main_parts_(NULL) { 30 : shell_browser_main_parts_(NULL) {
31 } 31 }
32 32
33 ShellContentBrowserClient::~ShellContentBrowserClient() { 33 ShellContentBrowserClient::~ShellContentBrowserClient() {
34 } 34 }
35 35
36 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( 36 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
37 const MainFunctionParams& parameters) { 37 const MainFunctionParams& parameters) {
38 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters); 38 shell_browser_main_parts_ = new ShellBrowserMainParts(parameters);
39 return shell_browser_main_parts_; 39 return shell_browser_main_parts_;
40 } 40 }
41 41
42 void ShellContentBrowserClient::RenderViewHostCreated( 42 void ShellContentBrowserClient::RenderViewHostCreated(
43 RenderViewHost* render_view_host) { 43 RenderViewHost* render_view_host) {
44 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 44 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
45 return; 45 return;
46 new LayoutTestControllerHost(render_view_host); 46 new WebKitTestRunnerHost(render_view_host);
47 } 47 }
48 48
49 void ShellContentBrowserClient::AppendExtraCommandLineSwitches( 49 void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
50 CommandLine* command_line, int child_process_id) { 50 CommandLine* command_line, int child_process_id) {
51 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 51 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
52 command_line->AppendSwitch(switches::kDumpRenderTree); 52 command_line->AppendSwitch(switches::kDumpRenderTree);
53 } 53 }
54 54
55 void ShellContentBrowserClient::ResourceDispatcherHostCreated() { 55 void ShellContentBrowserClient::ResourceDispatcherHostCreated() {
56 resource_dispatcher_host_delegate_.reset( 56 resource_dispatcher_host_delegate_.reset(
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ShellBrowserContext* 91 ShellBrowserContext*
92 ShellContentBrowserClient::off_the_record_browser_context() { 92 ShellContentBrowserClient::off_the_record_browser_context() {
93 return shell_browser_main_parts_->off_the_record_browser_context(); 93 return shell_browser_main_parts_->off_the_record_browser_context();
94 } 94 }
95 95
96 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() { 96 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
97 return new ShellAccessTokenStore(browser_context()->GetRequestContext()); 97 return new ShellAccessTokenStore(browser_context()->GetRequestContext());
98 } 98 }
99 99
100 } // namespace content 100 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main.cc ('k') | content/shell/shell_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698