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

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: tot-merge 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
« no previous file with comments | « 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 f12006cb476eb9013dbd5fdfbc6ec6924da9da3e..6ac6efc6fd013b384a08bf48a9a20ef721942fa1 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"
@@ -63,6 +64,20 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
};
+class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate {
+ public:
+ AthenaRendererMainDelegate() {}
+ virtual ~AthenaRendererMainDelegate() {}
+
+ private:
+ // apps::ShellRendererMainDelegate:
+ virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {}
+
+ virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE {}
+
+ DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate);
+};
+
class AthenaMainDelegate : public apps::ShellMainDelegate {
public:
AthenaMainDelegate() {}
@@ -75,6 +90,12 @@ class AthenaMainDelegate : public apps::ShellMainDelegate {
return new AthenaBrowserMainDelegate();
}
+ virtual scoped_ptr<apps::ShellRendererMainDelegate>
+ CreateShellRendererMainDelegate() OVERRIDE {
+ return scoped_ptr<apps::ShellRendererMainDelegate>(
+ new AthenaRendererMainDelegate());
+ }
+
DISALLOW_COPY_AND_ASSIGN(AthenaMainDelegate);
};
« no previous file with comments | « athena/main/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698