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

Unified Diff: athena/main/athena_main.cc

Issue 331323008: app-shell: Introduce a ShellRendererMainDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« apps/shell/renderer/shell_renderer_main_delegate.h ('K') | « athena/main/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« apps/shell/renderer/shell_renderer_main_delegate.h ('K') | « athena/main/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698