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

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

index 3dbbbab2cfaff61be4040e164660ee20af019f00..1b234c514d3c131a6f8a3485d66b6ea5a6cf08f2 100644

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

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

@@ -11,7 +11,7 @@ class BrowserContext;

namespace extensions {

-class ShellDesktopController;

+class DesktopController;

class ShellBrowserMainDelegate {

public:

@@ -28,7 +28,7 @@ class ShellBrowserMainDelegate {

// Creates the ShellDesktopController instance to initialize the root window

// and window manager. Subclass may return its subclass to customize the

// windo manager.

- virtual ShellDesktopController* CreateDesktopController() = 0;

+ virtual DesktopController* CreateDesktopController() = 0;

};

} // namespace extensions