| 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_delegate.h" | 8 #include "ash/launcher/launcher_delegate.h" |
| 9 #include "ash/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
| 10 #include "ash/launcher/launcher_types.h" | 10 #include "ash/launcher/launcher_types.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 #if defined(OS_CHROMEOS) | 171 #if defined(OS_CHROMEOS) |
| 172 virtual void LockScreen() OVERRIDE { | 172 virtual void LockScreen() OVERRIDE { |
| 173 ash::shell::CreateLockScreen(); | 173 ash::shell::CreateLockScreen(); |
| 174 } | 174 } |
| 175 #endif | 175 #endif |
| 176 | 176 |
| 177 virtual void Exit() OVERRIDE { | 177 virtual void Exit() OVERRIDE { |
| 178 MessageLoopForUI::current()->Quit(); | 178 MessageLoopForUI::current()->Quit(); |
| 179 } | 179 } |
| 180 | 180 |
| 181 virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE { | |
| 182 ash::shell::BuildAppListModel(model); | |
| 183 } | |
| 184 | |
| 185 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE { | 181 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE { |
| 186 return ash::shell::CreateAppListViewDelegate(); | 182 return ash::shell::CreateAppListViewDelegate(); |
| 187 } | 183 } |
| 188 | 184 |
| 189 std::vector<aura::Window*> GetCycleWindowList( | 185 std::vector<aura::Window*> GetCycleWindowList( |
| 190 CycleSource source, | 186 CycleSource source, |
| 191 CycleOrder order) const OVERRIDE { | 187 CycleOrder order) const OVERRIDE { |
| 192 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer( | 188 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer( |
| 193 ash::internal::kShellWindowId_DefaultContainer); | 189 ash::internal::kShellWindowId_DefaultContainer); |
| 194 std::vector<aura::Window*> windows = default_container->children(); | 190 std::vector<aura::Window*> windows = default_container->children(); |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 | 264 |
| 269 ash::Shell::DeleteInstance(); | 265 ash::Shell::DeleteInstance(); |
| 270 | 266 |
| 271 aura::RootWindow::DeleteInstance(); | 267 aura::RootWindow::DeleteInstance(); |
| 272 aura::Env::DeleteInstance(); | 268 aura::Env::DeleteInstance(); |
| 273 | 269 |
| 274 ui::CompositorTestSupport::Terminate(); | 270 ui::CompositorTestSupport::Terminate(); |
| 275 | 271 |
| 276 return 0; | 272 return 0; |
| 277 } | 273 } |
| OLD | NEW |