diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 17:43:21 +0000 |
| commit | bdcf915f370e489bb9b7934feca5711b3cc6bece (patch) | |
| tree | f67a450b1859c8e8565d1b150e7ca9915241938c /content/shell/shell_main_delegate.h | |
| parent | d346c5e45c83968c9d85c9ee8f792a6f001fa5c8 (diff) | |
| download | chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.zip chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.gz chromium_src-bdcf915f370e489bb9b7934feca5711b3cc6bece.tar.bz2 | |
Move content_shell and content_browsertests code into the content namespace.
BUG=90448
TBR=jochen
Review URL: https://chromiumcodereview.appspot.com/10809016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_main_delegate.h')
| -rw-r--r-- | content/shell/shell_main_delegate.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/content/shell/shell_main_delegate.h b/content/shell/shell_main_delegate.h index 687770b..d98321a 100644 --- a/content/shell/shell_main_delegate.h +++ b/content/shell/shell_main_delegate.h @@ -17,35 +17,35 @@ class ShellContentRendererClient; #if defined(OS_ANDROID) class BrowserMainRunner; #endif -} // namespace content -class ShellMainDelegate : public content::ContentMainDelegate { +class ShellMainDelegate : public ContentMainDelegate { public: ShellMainDelegate(); virtual ~ShellMainDelegate(); - // content::ContentMainDelegate implementation: + // ContentMainDelegate implementation: virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; virtual void PreSandboxStartup() OVERRIDE; virtual int RunProcess( const std::string& process_type, - const content::MainFunctionParams& main_function_params) OVERRIDE; - virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; - virtual content::ContentRendererClient* - CreateContentRendererClient() OVERRIDE; + const MainFunctionParams& main_function_params) OVERRIDE; + virtual ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; + virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE; private: void InitializeResourceBundle(); - scoped_ptr<content::ShellContentBrowserClient> browser_client_; - scoped_ptr<content::ShellContentRendererClient> renderer_client_; - content::ShellContentClient content_client_; + scoped_ptr<ShellContentBrowserClient> browser_client_; + scoped_ptr<ShellContentRendererClient> renderer_client_; + ShellContentClient content_client_; #if defined(OS_ANDROID) - scoped_ptr<content::BrowserMainRunner> browser_runner_; + scoped_ptr<BrowserMainRunner> browser_runner_; #endif DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); }; +} // namespace content + #endif // CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_ |