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

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

Issue 10809016: Move content_shell and content_browsertests code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android Created 8 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_content_browser_client.h ('k') | content/shell/shell_content_main.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"
(...skipping 16 matching lines...) Expand all
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 content::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 LayoutTestControllerHost(render_view_host);
47 } 47 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 87 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
88 return shell_browser_main_parts_->browser_context(); 88 return shell_browser_main_parts_->browser_context();
89 } 89 }
90 90
91 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() { 91 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
92 return new ShellAccessTokenStore(browser_context()->GetRequestContext()); 92 return new ShellAccessTokenStore(browser_context()->GetRequestContext());
93 } 93 }
94 94
95 } // namespace content 95 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | content/shell/shell_content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698