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/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 // We just use the Shell's default container of windows, so tests can be | 45 // We just use the Shell's default container of windows, so tests can be |
46 // written with the usual CreateTestWindowWithId() calls. But window cycling | 46 // written with the usual CreateTestWindowWithId() calls. But window cycling |
47 // expects the topmost window at the front of the list, so reverse the order. | 47 // expects the topmost window at the front of the list, so reverse the order. |
48 aura::Window* default_container = Shell::GetInstance()->GetContainer( | 48 aura::Window* default_container = Shell::GetInstance()->GetContainer( |
49 internal::kShellWindowId_DefaultContainer); | 49 internal::kShellWindowId_DefaultContainer); |
50 std::vector<aura::Window*> windows = default_container->children(); | 50 std::vector<aura::Window*> windows = default_container->children(); |
51 std::reverse(windows.begin(), windows.end()); | 51 std::reverse(windows.begin(), windows.end()); |
52 return windows; | 52 return windows; |
53 } | 53 } |
54 | 54 |
| 55 void TestShellDelegate::OpenNewTab(NewTabContentType type) { |
| 56 } |
| 57 |
55 void TestShellDelegate::CreateNewWindow() { | 58 void TestShellDelegate::CreateNewWindow() { |
56 } | 59 } |
57 | 60 |
58 void TestShellDelegate::LauncherItemClicked(const LauncherItem& item) { | 61 void TestShellDelegate::LauncherItemClicked(const LauncherItem& item) { |
59 } | 62 } |
60 | 63 |
61 int TestShellDelegate::GetBrowserShortcutResourceId() { | 64 int TestShellDelegate::GetBrowserShortcutResourceId() { |
62 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; | 65 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; |
63 } | 66 } |
64 | 67 |
65 string16 TestShellDelegate::GetLauncherItemTitle(const LauncherItem& item) { | 68 string16 TestShellDelegate::GetLauncherItemTitle(const LauncherItem& item) { |
66 return string16(); | 69 return string16(); |
67 } | 70 } |
68 | 71 |
69 } // namespace test | 72 } // namespace test |
70 } // namespace ash | 73 } // namespace ash |
OLD | NEW |