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

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
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..fac10ca2c0319340707d4f59f1fef04f4622c294 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -6,6 +6,7 @@
#include "apps/shell/browser/shell_content_browser_client.h"
#include "apps/shell/common/shell_content_client.h"
+#include "apps/shell/common/shell_delegate.h"
#include "apps/shell/renderer/shell_content_renderer_client.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -38,7 +39,8 @@ void InitLogging() {
namespace apps {
-ShellMainDelegate::ShellMainDelegate() {
+ShellMainDelegate::ShellMainDelegate(ShellDelegate* shell_delegate)
+ : shell_delegate_(shell_delegate) {
}
ShellMainDelegate::~ShellMainDelegate() {
@@ -65,7 +67,7 @@ void ShellMainDelegate::PreSandboxStartup() {
}
content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
- browser_client_.reset(new apps::ShellContentBrowserClient);
+ browser_client_.reset(new apps::ShellContentBrowserClient(shell_delegate_));
return browser_client_.get();
}

Powered by Google App Engine
This is Rietveld 408576698