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/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
11 #include "ash/session_state_delegate.h" | 11 #include "ash/session_state_delegate.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "ash/shell/keyboard_controller_proxy_stub.h" |
13 #include "ash/shell_window_ids.h" | 14 #include "ash/shell_window_ids.h" |
14 #include "ash/test/test_launcher_delegate.h" | 15 #include "ash/test/test_launcher_delegate.h" |
15 #include "ash/test/test_session_state_delegate.h" | 16 #include "ash/test/test_session_state_delegate.h" |
16 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
17 #include "base/logging.h" | 18 #include "base/logging.h" |
18 #include "content/public/test/test_browser_context.h" | 19 #include "content/public/test/test_browser_context.h" |
19 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
20 | 21 |
21 namespace ash { | 22 namespace ash { |
22 namespace test { | 23 namespace test { |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 } | 80 } |
80 | 81 |
81 void TestShellDelegate::RestoreTab() { | 82 void TestShellDelegate::RestoreTab() { |
82 } | 83 } |
83 | 84 |
84 void TestShellDelegate::ShowKeyboardOverlay() { | 85 void TestShellDelegate::ShowKeyboardOverlay() { |
85 } | 86 } |
86 | 87 |
87 keyboard::KeyboardControllerProxy* | 88 keyboard::KeyboardControllerProxy* |
88 TestShellDelegate::CreateKeyboardControllerProxy() { | 89 TestShellDelegate::CreateKeyboardControllerProxy() { |
89 return NULL; | 90 return new KeyboardControllerProxyStub(); |
90 } | 91 } |
91 | 92 |
92 void TestShellDelegate::ShowTaskManager() { | 93 void TestShellDelegate::ShowTaskManager() { |
93 } | 94 } |
94 | 95 |
95 content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { | 96 content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { |
96 current_browser_context_.reset(new content::TestBrowserContext()); | 97 current_browser_context_.reset(new content::TestBrowserContext()); |
97 return current_browser_context_.get(); | 98 return current_browser_context_.get(); |
98 } | 99 } |
99 | 100 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 base::string16 TestShellDelegate::GetProductName() const { | 220 base::string16 TestShellDelegate::GetProductName() const { |
220 return base::string16(); | 221 return base::string16(); |
221 } | 222 } |
222 | 223 |
223 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 224 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
224 return test_session_state_delegate_; | 225 return test_session_state_delegate_; |
225 } | 226 } |
226 | 227 |
227 } // namespace test | 228 } // namespace test |
228 } // namespace ash | 229 } // namespace ash |
OLD | NEW |