Chromium Code Reviews| Index: athena/main/athena_main.cc |
| diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc |
| index 4a69779866def67dd188ef55042f7742ccd72664..05c05acd55bbd7f6585a360f5fdba55e27913281 100644 |
| --- a/athena/main/athena_main.cc |
| +++ b/athena/main/athena_main.cc |
| @@ -6,6 +6,7 @@ |
| #include "apps/shell/browser/shell_browser_main_delegate.h" |
| #include "apps/shell/browser/shell_desktop_controller.h" |
| #include "apps/shell/browser/shell_extension_system.h" |
| +#include "apps/shell/renderer/shell_renderer_main_delegate.h" |
| #include "athena/content/public/content_activity_factory.h" |
| #include "athena/content/public/content_app_model_builder.h" |
| #include "athena/home/public/home_card.h" |
| @@ -59,6 +60,17 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { |
| DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate); |
| }; |
| +class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate { |
| + public: |
| + virtual ~AthenaRendererMainDelegate() {} |
| + |
| + private: |
| + // apps::ShellRendererMainDelegate: |
| + virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {} |
| + |
| + virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE {} |
| +}; |
|
James Cook
2014/06/17 17:40:22
DISALLOW_COPY_AND_ASSIGN?
sadrul
2014/06/17 20:37:39
Done.
|
| + |
| class AthenaMainDelegate : public apps::ShellMainDelegate { |
| public: |
| AthenaMainDelegate() {} |
| @@ -71,6 +83,11 @@ class AthenaMainDelegate : public apps::ShellMainDelegate { |
| return new AthenaBrowserMainDelegate(); |
| } |
| + virtual apps::ShellRendererMainDelegate* CreateShellRendererMainDelegate() |
| + OVERRIDE { |
| + return new AthenaRendererMainDelegate(); |
|
James Cook
2014/06/17 17:40:22
Doesn't this leak?
sadrul
2014/06/17 20:37:39
It indeed does. I have clarified the ownership of
|
| + } |
| + |
| DISALLOW_COPY_AND_ASSIGN(AthenaMainDelegate); |
| }; |