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

Side by Side Diff: content/shell/shell_main_delegate.h

Issue 10832014: Move the browser tests inside content/renderer to run under content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac 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/renderer/renderer_accessibility_browsertest.cc ('k') | no next file » | 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 #ifndef CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_ 5 #ifndef CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
6 #define CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_ 6 #define CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/shell/shell_content_client.h" 10 #include "content/shell/shell_content_client.h"
(...skipping 14 matching lines...) Expand all
25 25
26 // ContentMainDelegate implementation: 26 // ContentMainDelegate implementation:
27 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; 27 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
28 virtual void PreSandboxStartup() OVERRIDE; 28 virtual void PreSandboxStartup() OVERRIDE;
29 virtual int RunProcess( 29 virtual int RunProcess(
30 const std::string& process_type, 30 const std::string& process_type,
31 const MainFunctionParams& main_function_params) OVERRIDE; 31 const MainFunctionParams& main_function_params) OVERRIDE;
32 virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; 32 virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
33 virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE; 33 virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
34 34
35 static void InitializeResourceBundle();
36
35 private: 37 private:
36 void InitializeResourceBundle();
37
38 scoped_ptr<ShellContentBrowserClient> browser_client_; 38 scoped_ptr<ShellContentBrowserClient> browser_client_;
39 scoped_ptr<ShellContentRendererClient> renderer_client_; 39 scoped_ptr<ShellContentRendererClient> renderer_client_;
40 ShellContentClient content_client_; 40 ShellContentClient content_client_;
41 41
42 #if defined(OS_ANDROID) 42 #if defined(OS_ANDROID)
43 scoped_ptr<BrowserMainRunner> browser_runner_; 43 scoped_ptr<BrowserMainRunner> browser_runner_;
44 #endif 44 #endif
45 45
46 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); 46 DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
47 }; 47 };
48 48
49 } // namespace content 49 } // namespace content
50 50
51 #endif // CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_ 51 #endif // CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « content/renderer/renderer_accessibility_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698