extensions/shell/browser/default_shell_browser_main_delegate.h - Issue 480353006: Separate athena's startup process from AppShell's

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: extensions/shell/browser/default_shell_browser_main_delegate.h

Issue 480353006: Separate athena's startup process from AppShell's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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: extensions/shell/browser/default_shell_browser_main_delegate.h

diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.h b/extensions/shell/browser/default_shell_browser_main_delegate.h

index a59c2e4da72ebb0ce5acd0bb65bec9898ec4d97b..847817a9682ef757c27ab1e779cbe48a8ef73b6a 100644

--- a/extensions/shell/browser/default_shell_browser_main_delegate.h

+++ b/extensions/shell/browser/default_shell_browser_main_delegate.h

@@ -21,7 +21,7 @@ class DefaultShellBrowserMainDelegate : public ShellBrowserMainDelegate {

// ShellBrowserMainDelegate:

virtual void Start(content::BrowserContext* context) OVERRIDE;

virtual void Shutdown() OVERRIDE;

- virtual ShellDesktopController* CreateDesktopController() OVERRIDE;

+ virtual DesktopController* CreateDesktopController() OVERRIDE;

private:

DISALLOW_COPY_AND_ASSIGN(DefaultShellBrowserMainDelegate);