| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "ash/launcher/launcher.h" | 7 #include "ash/launcher/launcher.h" |
| 8 #include "ash/launcher/launcher_model.h" | 8 #include "ash/launcher/launcher_model.h" |
| 9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 CycleSource source, | 148 CycleSource source, |
| 149 CycleOrder order) const OVERRIDE { | 149 CycleOrder order) const OVERRIDE { |
| 150 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer( | 150 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer( |
| 151 ash::internal::kShellWindowId_DefaultContainer); | 151 ash::internal::kShellWindowId_DefaultContainer); |
| 152 std::vector<aura::Window*> windows = default_container->children(); | 152 std::vector<aura::Window*> windows = default_container->children(); |
| 153 // Window cycling expects the topmost window at the front of the list. | 153 // Window cycling expects the topmost window at the front of the list. |
| 154 std::reverse(windows.begin(), windows.end()); | 154 std::reverse(windows.begin(), windows.end()); |
| 155 return windows; | 155 return windows; |
| 156 } | 156 } |
| 157 | 157 |
| 158 virtual void RotateFocus(bool forward) OVERRIDE { |
| 159 // Not Implemented |
| 160 } |
| 161 |
| 158 virtual void LauncherItemClicked( | 162 virtual void LauncherItemClicked( |
| 159 const ash::LauncherItem& item) OVERRIDE { | 163 const ash::LauncherItem& item) OVERRIDE { |
| 160 aura::Window* window = watcher_->GetWindowByID(item.id); | 164 aura::Window* window = watcher_->GetWindowByID(item.id); |
| 161 window->Show(); | 165 window->Show(); |
| 162 ash::ActivateWindow(window); | 166 ash::ActivateWindow(window); |
| 163 } | 167 } |
| 164 | 168 |
| 165 virtual int GetBrowserShortcutResourceId() OVERRIDE { | 169 virtual int GetBrowserShortcutResourceId() OVERRIDE { |
| 166 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; | 170 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; |
| 167 } | 171 } |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 window_watcher.reset(); | 221 window_watcher.reset(); |
| 218 | 222 |
| 219 ash::Shell::DeleteInstance(); | 223 ash::Shell::DeleteInstance(); |
| 220 | 224 |
| 221 aura::RootWindow::DeleteInstance(); | 225 aura::RootWindow::DeleteInstance(); |
| 222 | 226 |
| 223 ui::CompositorTestSupport::Terminate(); | 227 ui::CompositorTestSupport::Terminate(); |
| 224 | 228 |
| 225 return 0; | 229 return 0; |
| 226 } | 230 } |
| OLD | NEW |