OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "apps/shell/browser/default_shell_browser_main_delegate.h" | 5 #include "apps/shell/browser/default_shell_browser_main_delegate.h" |
6 | 6 |
| 7 #include "apps/shell/browser/default_shell_app_window_controller.h" |
7 #include "apps/shell/browser/shell_desktop_controller.h" | 8 #include "apps/shell/browser/shell_desktop_controller.h" |
8 #include "apps/shell/browser/shell_extension_system.h" | 9 #include "apps/shell/browser/shell_extension_system.h" |
9 #include "base/command_line.h" | 10 #include "base/command_line.h" |
10 #include "base/file_util.h" | 11 #include "base/file_util.h" |
11 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
12 | 13 |
13 namespace apps { | 14 namespace apps { |
14 | 15 |
15 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { | 16 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { |
16 } | 17 } |
(...skipping 18 matching lines...) Expand all Loading... |
35 } else { | 36 } else { |
36 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future"; | 37 LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future"; |
37 } | 38 } |
38 } | 39 } |
39 | 40 |
40 void DefaultShellBrowserMainDelegate::Shutdown() { | 41 void DefaultShellBrowserMainDelegate::Shutdown() { |
41 } | 42 } |
42 | 43 |
43 ShellDesktopController* | 44 ShellDesktopController* |
44 DefaultShellBrowserMainDelegate::CreateDesktopController() { | 45 DefaultShellBrowserMainDelegate::CreateDesktopController() { |
45 return new ShellDesktopController(); | 46 ShellDesktopController* desktop = new ShellDesktopController(); |
| 47 desktop->SetAppWindowController(new DefaultShellAppWindowController(desktop)); |
| 48 return desktop; |
46 } | 49 } |
47 | 50 |
48 } // namespace apps | 51 } // namespace apps |
OLD | NEW |