apps/shell/app/shell_main_delegate.cc - Issue 270763002: Minimal athena shell main

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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..9912e2fdb0fc26c8149154fc7bd96adc0ff4e5b0 100644

--- a/apps/shell/app/shell_main_delegate.cc

+++ b/apps/shell/app/shell_main_delegate.cc

@@ -38,7 +38,10 @@ void InitLogging() {

namespace apps {

-ShellMainDelegate::ShellMainDelegate() {

+ShellMainDelegate::ShellMainDelegate(

+ ShellBrowserMainDelegate* browser_main_delegate) {

+ browser_client_.reset(

+ new apps::ShellContentBrowserClient(browser_main_delegate));

}

ShellMainDelegate::~ShellMainDelegate() {

@@ -65,7 +68,6 @@ void ShellMainDelegate::PreSandboxStartup() {

}

content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {

- browser_client_.reset(new apps::ShellContentBrowserClient);

return browser_client_.get();

}