| 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/caps_lock_delegate_stub.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
| 12 #include "ash/test/test_launcher_delegate.h" | 12 #include "ash/test/test_launcher_delegate.h" |
| 13 #include "content/public/test/test_browser_context.h" | 13 #include "content/public/test/test_browser_context.h" |
| 14 #include "grit/ui_resources.h" | |
| 15 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 16 | 15 |
| 17 namespace ash { | 16 namespace ash { |
| 18 namespace test { | 17 namespace test { |
| 19 | 18 |
| 20 TestShellDelegate::TestShellDelegate() | 19 TestShellDelegate::TestShellDelegate() |
| 21 : locked_(false), | 20 : locked_(false), |
| 22 spoken_feedback_enabled_(false) { | 21 spoken_feedback_enabled_(false) { |
| 23 } | 22 } |
| 24 | 23 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 131 |
| 133 void TestShellDelegate::HandleMediaPrevTrack() { | 132 void TestShellDelegate::HandleMediaPrevTrack() { |
| 134 } | 133 } |
| 135 | 134 |
| 136 string16 TestShellDelegate::GetTimeRemainingString(base::TimeDelta delta) { | 135 string16 TestShellDelegate::GetTimeRemainingString(base::TimeDelta delta) { |
| 137 return string16(); | 136 return string16(); |
| 138 } | 137 } |
| 139 | 138 |
| 140 } // namespace test | 139 } // namespace test |
| 141 } // namespace ash | 140 } // namespace ash |
| OLD | NEW |