| 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 "ash/test/test_shell_delegate.h" | 5 #include "ash/test/test_shell_delegate.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/screenshot_delegate.h" | 9 #include "ash/screenshot_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
| 12 #include "ash/test/test_launcher_delegate.h" |
| 12 #include "grit/ui_resources.h" | 13 #include "grit/ui_resources.h" |
| 13 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 14 | 15 |
| 15 namespace ash { | 16 namespace ash { |
| 16 namespace test { | 17 namespace test { |
| 17 | 18 |
| 18 TestShellDelegate::TestShellDelegate() : locked_(false) { | 19 TestShellDelegate::TestShellDelegate() : locked_(false) { |
| 19 } | 20 } |
| 20 | 21 |
| 21 TestShellDelegate::~TestShellDelegate() { | 22 TestShellDelegate::~TestShellDelegate() { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 52 } | 53 } |
| 53 | 54 |
| 54 void TestShellDelegate::StartPartialScreenshot( | 55 void TestShellDelegate::StartPartialScreenshot( |
| 55 ScreenshotDelegate* screenshot_delegate) { | 56 ScreenshotDelegate* screenshot_delegate) { |
| 56 if (screenshot_delegate) | 57 if (screenshot_delegate) |
| 57 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect()); | 58 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect()); |
| 58 } | 59 } |
| 59 | 60 |
| 60 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( | 61 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( |
| 61 ash::LauncherModel* model) { | 62 ash::LauncherModel* model) { |
| 62 return NULL; | 63 return new TestLauncherDelegate(model); |
| 63 } | 64 } |
| 64 | 65 |
| 65 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( | 66 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( |
| 66 SystemTray* tray) { | 67 SystemTray* tray) { |
| 67 return NULL; | 68 return NULL; |
| 68 } | 69 } |
| 69 | 70 |
| 70 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { | 71 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { |
| 71 return NULL; | 72 return NULL; |
| 72 } | 73 } |
| 73 | 74 |
| 74 } // namespace test | 75 } // namespace test |
| 75 } // namespace ash | 76 } // namespace ash |
| OLD | NEW |