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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 258 |
263 ash::Shell::DeleteInstance(); | 259 ash::Shell::DeleteInstance(); |
264 | 260 |
265 aura::RootWindow::DeleteInstance(); | 261 aura::RootWindow::DeleteInstance(); |
266 aura::Env::DeleteInstance(); | 262 aura::Env::DeleteInstance(); |
267 | 263 |
268 ui::CompositorTestSupport::Terminate(); | 264 ui::CompositorTestSupport::Terminate(); |
269 | 265 |
270 return 0; | 266 return 0; |
271 } | 267 } |
OLD | NEW |