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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 } | 132 } |
133 | 133 |
134 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 134 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { |
135 return new MediaDelegateImpl; | 135 return new MediaDelegateImpl; |
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( |
| 143 aura::Window* root, |
| 144 ash::ShelfItemDelegate* item_delegate, |
| 145 ash::LauncherItem* item) { |
143 return NULL; | 146 return NULL; |
144 } | 147 } |
145 | 148 |
146 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { | 149 WindowTreeHostFactory* TestShellDelegate::CreateWindowTreeHostFactory() { |
147 return WindowTreeHostFactory::Create(); | 150 return WindowTreeHostFactory::Create(); |
148 } | 151 } |
149 | 152 |
150 base::string16 TestShellDelegate::GetProductName() const { | 153 base::string16 TestShellDelegate::GetProductName() const { |
151 return base::string16(); | 154 return base::string16(); |
152 } | 155 } |
153 | 156 |
154 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 157 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
155 return test_session_state_delegate_; | 158 return test_session_state_delegate_; |
156 } | 159 } |
157 | 160 |
158 } // namespace test | 161 } // namespace test |
159 } // namespace ash | 162 } // namespace ash |
OLD | NEW |