| 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 <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "ash/caps_lock_delegate_stub.h" | 9 #include "ash/caps_lock_delegate_stub.h" |
| 10 #include "ash/default_accessibility_delegate.h" | 10 #include "ash/default_accessibility_delegate.h" |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 } | 129 } |
| 130 | 130 |
| 131 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 131 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { |
| 132 return new NewWindowDelegateImpl; | 132 return new NewWindowDelegateImpl; |
| 133 } | 133 } |
| 134 | 134 |
| 135 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 135 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { |
| 136 return new MediaDelegateImpl; | 136 return new MediaDelegateImpl; |
| 137 } | 137 } |
| 138 | 138 |
| 139 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() { | |
| 140 return NULL; | |
| 141 } | |
| 142 | |
| 143 ui::MenuModel* TestShellDelegate::CreateContextMenu( | 139 ui::MenuModel* TestShellDelegate::CreateContextMenu( |
| 144 aura::Window* root, | 140 aura::Window* root, |
| 145 ash::ShelfItemDelegate* item_delegate, | 141 ash::ShelfItemDelegate* item_delegate, |
| 146 ash::ShelfItem* item) { | 142 ash::ShelfItem* item) { |
| 147 return NULL; | 143 return NULL; |
| 148 } | 144 } |
| 149 | 145 |
| 150 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { | 146 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { |
| 151 return WindowTreeHostFactory::Create(); | 147 return WindowTreeHostFactory::Create(); |
| 152 } | 148 } |
| 153 | 149 |
| 154 GPUSupport* TestShellDelegate::CreateGPUSupport() { | 150 GPUSupport* TestShellDelegate::CreateGPUSupport() { |
| 155 // Real GPU support depends on src/content, so just use a stub. | 151 // Real GPU support depends on src/content, so just use a stub. |
| 156 return new GPUSupportStub; | 152 return new GPUSupportStub; |
| 157 } | 153 } |
| 158 | 154 |
| 159 base::string16 TestShellDelegate::GetProductName() const { | 155 base::string16 TestShellDelegate::GetProductName() const { |
| 160 return base::string16(); | 156 return base::string16(); |
| 161 } | 157 } |
| 162 | 158 |
| 163 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 159 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
| 164 return test_session_state_delegate_; | 160 return test_session_state_delegate_; |
| 165 } | 161 } |
| 166 | 162 |
| 167 } // namespace test | 163 } // namespace test |
| 168 } // namespace ash | 164 } // namespace ash |
| OLD | NEW |