diff options
| author | oshima <oshima@chromium.org> | 2014-08-25 14:32:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 21:35:50 +0000 |
| commit | 1629c184e328e7263e93042de97af58651ebe510 (patch) | |
| tree | 5d91c6827fc18651b95c6530c7da403a162ea8e0 /extensions/shell/browser/default_shell_browser_main_delegate.cc | |
| parent | d27cb086ffcbfdc4c3f5b1d1d483b28dff5bd26c (diff) | |
| download | chromium_src-1629c184e328e7263e93042de97af58651ebe510.zip chromium_src-1629c184e328e7263e93042de97af58651ebe510.tar.gz chromium_src-1629c184e328e7263e93042de97af58651ebe510.tar.bz2 | |
Separate athena's startup process from AppShell's
* Introduced DesktopController interface. app_shell's Init process stays in ShellDesktopController
* Removed ShellAppWindowController
* Athena has its own AthenaDesktopController
* Intorduced AthenaEnv. This is now used for both AthenaMain and Unit test.
* Removed ScreenManagerDelegate and integrate it into AthenaEnv.
* Moved FocusController to ScreenManager, and removed CreateFocusRules()
BUG=397167
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/480353006
Cr-Commit-Position: refs/heads/master@{#291763}
Diffstat (limited to 'extensions/shell/browser/default_shell_browser_main_delegate.cc')
| -rw-r--r-- | extensions/shell/browser/default_shell_browser_main_delegate.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc index 5fb2cf1..51b936b9 100644 --- a/extensions/shell/browser/default_shell_browser_main_delegate.cc +++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/files/file_path.h" -#include "extensions/shell/browser/default_shell_app_window_controller.h" #include "extensions/shell/browser/shell_desktop_controller.h" #include "extensions/shell/browser/shell_extension_system.h" #include "extensions/shell/common/switches.h" @@ -42,11 +41,8 @@ void DefaultShellBrowserMainDelegate::Start( void DefaultShellBrowserMainDelegate::Shutdown() { } -ShellDesktopController* -DefaultShellBrowserMainDelegate::CreateDesktopController() { - ShellDesktopController* desktop = new ShellDesktopController(); - desktop->SetAppWindowController(new DefaultShellAppWindowController(desktop)); - return desktop; +DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() { + return new ShellDesktopController(); } } // namespace extensions |