| 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/caps_lock_delegate_stub.h" |
| 9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
| 11 #include "ash/test/test_launcher_delegate.h" | 12 #include "ash/test/test_launcher_delegate.h" |
| 12 #include "content/public/test/test_browser_context.h" | 13 #include "content/public/test/test_browser_context.h" |
| 13 #include "grit/ui_resources.h" | 14 #include "grit/ui_resources.h" |
| 14 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
| 15 | 16 |
| 16 namespace ash { | 17 namespace ash { |
| 17 namespace test { | 18 namespace test { |
| 18 | 19 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 102 |
| 102 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( | 103 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( |
| 103 SystemTray* tray) { | 104 SystemTray* tray) { |
| 104 return NULL; | 105 return NULL; |
| 105 } | 106 } |
| 106 | 107 |
| 107 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { | 108 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { |
| 108 return NULL; | 109 return NULL; |
| 109 } | 110 } |
| 110 | 111 |
| 112 CapsLockDelegate* TestShellDelegate::CreateCapsLockDelegate() { |
| 113 return new CapsLockDelegateStub; |
| 114 } |
| 115 |
| 111 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() { | 116 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() { |
| 112 return NULL; | 117 return NULL; |
| 113 } | 118 } |
| 114 | 119 |
| 115 void TestShellDelegate::OpenFeedbackPage() { | 120 void TestShellDelegate::OpenFeedbackPage() { |
| 116 } | 121 } |
| 117 | 122 |
| 118 void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) { | 123 void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) { |
| 119 } | 124 } |
| 120 | 125 |
| 121 } // namespace test | 126 } // namespace test |
| 122 } // namespace ash | 127 } // namespace ash |
| OLD | NEW |