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 "extensions/shell/browser/default_shell_browser_main_delegate.h" | 5 #include "extensions/shell/browser/default_shell_browser_main_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/strings/string_tokenizer.h" | 10 #include "base/strings/string_tokenizer.h" |
11 #include "extensions/common/switches.h" | 11 #include "extensions/common/switches.h" |
12 #include "extensions/shell/browser/shell_extension_system.h" | 12 #include "extensions/shell/browser/shell_extension_system.h" |
13 | 13 |
14 #if defined(USE_AURA) | 14 #if defined(USE_AURA) |
15 #include "extensions/shell/browser/shell_desktop_controller_aura.h" | 15 #include "extensions/shell/browser/shell_desktop_controller_aura.h" |
16 #endif | 16 #endif |
17 | 17 |
| 18 #if defined(OS_MACOSX) |
| 19 #include "extensions/shell/browser/shell_desktop_controller_mac.h" |
| 20 #endif |
| 21 |
18 namespace extensions { | 22 namespace extensions { |
19 | 23 |
20 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { | 24 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() { |
21 } | 25 } |
22 | 26 |
23 DefaultShellBrowserMainDelegate::~DefaultShellBrowserMainDelegate() { | 27 DefaultShellBrowserMainDelegate::~DefaultShellBrowserMainDelegate() { |
24 } | 28 } |
25 | 29 |
26 void DefaultShellBrowserMainDelegate::Start( | 30 void DefaultShellBrowserMainDelegate::Start( |
27 content::BrowserContext* browser_context) { | 31 content::BrowserContext* browser_context) { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 << " unset; boredom is in your future"; | 64 << " unset; boredom is in your future"; |
61 } | 65 } |
62 } | 66 } |
63 | 67 |
64 void DefaultShellBrowserMainDelegate::Shutdown() { | 68 void DefaultShellBrowserMainDelegate::Shutdown() { |
65 } | 69 } |
66 | 70 |
67 DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() { | 71 DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() { |
68 #if defined(USE_AURA) | 72 #if defined(USE_AURA) |
69 return new ShellDesktopControllerAura(); | 73 return new ShellDesktopControllerAura(); |
| 74 #elif defined(OS_MACOSX) |
| 75 return new ShellDesktopControllerMac(); |
70 #else | 76 #else |
71 return NULL; | 77 return NULL; |
72 #endif | 78 #endif |
73 } | 79 } |
74 | 80 |
75 } // namespace extensions | 81 } // namespace extensions |
OLD | NEW |