| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 } | 136 } |
| 137 | 137 |
| 138 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() { | 138 aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() { |
| 139 return NULL; | 139 return NULL; |
| 140 } | 140 } |
| 141 | 141 |
| 142 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) { | 142 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) { |
| 143 return NULL; | 143 return NULL; |
| 144 } | 144 } |
| 145 | 145 |
| 146 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() { | 146 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { |
| 147 return RootWindowHostFactory::Create(); | 147 return WindowTreeHostFactory::Create(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 base::string16 TestShellDelegate::GetProductName() const { | 150 base::string16 TestShellDelegate::GetProductName() const { |
| 151 return base::string16(); | 151 return base::string16(); |
| 152 } | 152 } |
| 153 | 153 |
| 154 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 154 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
| 155 return test_session_state_delegate_; | 155 return test_session_state_delegate_; |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace test | 158 } // namespace test |
| 159 } // namespace ash | 159 } // namespace ash |
| OLD | NEW |