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

Unified Diff: apps/shell/app/shell_main_delegate.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 | « apps/shell/app/shell_main_delegate.h ('k') | apps/shell/app_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app/shell_main_delegate.cc
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index b8f835d1ae84a3e6177c0afabded275a1b090ed9..2a9cd1439f170df486bc20c0171418e236daf8c0 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -8,6 +8,7 @@
#include "apps/shell/browser/shell_content_browser_client.h"
#include "apps/shell/common/shell_content_client.h"
#include "apps/shell/renderer/shell_content_renderer_client.h"
+#include "apps/shell/renderer/shell_renderer_main_delegate.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h"
@@ -73,7 +74,8 @@ content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
content::ContentRendererClient*
ShellMainDelegate::CreateContentRendererClient() {
- renderer_client_.reset(new ShellContentRendererClient);
+ renderer_client_.reset(
+ new ShellContentRendererClient(CreateShellRendererMainDelegate()));
return renderer_client_.get();
}
@@ -81,6 +83,11 @@ ShellBrowserMainDelegate* ShellMainDelegate::CreateShellBrowserMainDelegate() {
return new DefaultShellBrowserMainDelegate();
}
+scoped_ptr<ShellRendererMainDelegate>
+ShellMainDelegate::CreateShellRendererMainDelegate() {
+ return scoped_ptr<ShellRendererMainDelegate>();
+}
+
// static
bool ShellMainDelegate::ProcessNeedsResourceBundle(
const std::string& process_type) {
« no previous file with comments | « apps/shell/app/shell_main_delegate.h ('k') | apps/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698