diff options
author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:44:14 +0000 |
---|---|---|
committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:44:14 +0000 |
commit | e5df69d4c55438249f0c7e32d9efb6a63181b440 (patch) | |
tree | 3c37ddb46bb2bdab0a882b33e42cdb6b7ef65ad4 /content/shell/shell_main_delegate.h | |
parent | 5a073091c79e3d46a522edbcd4a7565b7d8505e5 (diff) | |
download | chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.zip chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.tar.gz chromium_src-e5df69d4c55438249f0c7e32d9efb6a63181b440.tar.bz2 |
- Removed the message loop from shell_browser_main_parts.cc. We don't need
that code as the message loop will be initialized by BrowserMainRunner.
- Cleared the unused code in shell_browser_main.cc
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10536018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_main_delegate.h')
-rw-r--r-- | content/shell/shell_main_delegate.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/shell/shell_main_delegate.h b/content/shell/shell_main_delegate.h index a36dbcc..04697b7 100644 --- a/content/shell/shell_main_delegate.h +++ b/content/shell/shell_main_delegate.h @@ -14,6 +14,10 @@ namespace content { class ShellContentBrowserClient; class ShellContentRendererClient; + +#if defined(OS_ANDROID) +class BrowserMainRunner; +#endif } // namespace content class ShellMainDelegate : public content::ContentMainDelegate { @@ -38,6 +42,10 @@ class ShellMainDelegate : public content::ContentMainDelegate { scoped_ptr<content::ShellContentRendererClient> renderer_client_; content::ShellContentClient content_client_; +#if defined(OS_ANDROID) + scoped_ptr<content::BrowserMainRunner> browser_runner_; +#endif + DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate); }; |