OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "ash/launcher/launcher.h" | 7 #include "ash/launcher/launcher.h" |
8 #include "ash/launcher/launcher_delegate.h" | 8 #include "ash/launcher/launcher_delegate.h" |
9 #include "ash/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
10 #include "ash/launcher/launcher_types.h" | 10 #include "ash/launcher/launcher_types.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 ash::LauncherModel* model) OVERRIDE { | 227 ash::LauncherModel* model) OVERRIDE { |
228 launcher_delegate_ = new LauncherDelegateImpl(watcher_); | 228 launcher_delegate_ = new LauncherDelegateImpl(watcher_); |
229 return launcher_delegate_; | 229 return launcher_delegate_; |
230 } | 230 } |
231 | 231 |
232 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( | 232 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( |
233 ash::SystemTray* tray) { | 233 ash::SystemTray* tray) { |
234 return NULL; | 234 return NULL; |
235 } | 235 } |
236 | 236 |
| 237 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
| 238 return NULL; |
| 239 } |
| 240 |
237 private: | 241 private: |
238 // Used to update Launcher. Owned by main. | 242 // Used to update Launcher. Owned by main. |
239 WindowWatcher* watcher_; | 243 WindowWatcher* watcher_; |
240 | 244 |
241 LauncherDelegateImpl* launcher_delegate_; | 245 LauncherDelegateImpl* launcher_delegate_; |
242 | 246 |
243 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); | 247 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |
244 }; | 248 }; |
245 | 249 |
246 } // namespace | 250 } // namespace |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 window_watcher.reset(); | 287 window_watcher.reset(); |
284 | 288 |
285 ash::Shell::DeleteInstance(); | 289 ash::Shell::DeleteInstance(); |
286 | 290 |
287 aura::Env::DeleteInstance(); | 291 aura::Env::DeleteInstance(); |
288 | 292 |
289 ui::CompositorTestSupport::Terminate(); | 293 ui::CompositorTestSupport::Terminate(); |
290 | 294 |
291 return 0; | 295 return 0; |
292 } | 296 } |
OLD | NEW |