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

Unified Diff: apps/shell/app/shell_main_delegate.cc

Issue 270763002: Minimal athena shell main (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 13706cda47a78edcf9960e4953b1c0c3a6a0e880..b8f835d1ae84a3e6177c0afabded275a1b090ed9 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -4,6 +4,7 @@
#include "apps/shell/app/shell_main_delegate.h"
+#include "apps/shell/browser/default_shell_browser_main_delegate.h"
#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"
@@ -65,7 +66,8 @@ void ShellMainDelegate::PreSandboxStartup() {
}
content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
- browser_client_.reset(new apps::ShellContentBrowserClient);
+ browser_client_.reset(
+ new apps::ShellContentBrowserClient(CreateShellBrowserMainDelegate()));
return browser_client_.get();
}
@@ -75,6 +77,10 @@ ShellMainDelegate::CreateContentRendererClient() {
return renderer_client_.get();
}
+ShellBrowserMainDelegate* ShellMainDelegate::CreateShellBrowserMainDelegate() {
+ return new DefaultShellBrowserMainDelegate();
+}
+
// 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