| 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 "chrome/browser/ui/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
| 8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 #else | 306 #else |
| 307 return false; | 307 return false; |
| 308 #endif | 308 #endif |
| 309 } | 309 } |
| 310 | 310 |
| 311 app_list::AppListViewDelegate* | 311 app_list::AppListViewDelegate* |
| 312 ChromeShellDelegate::CreateAppListViewDelegate() { | 312 ChromeShellDelegate::CreateAppListViewDelegate() { |
| 313 DCHECK(ash::Shell::HasInstance()); | 313 DCHECK(ash::Shell::HasInstance()); |
| 314 // Shell will own the created delegate, and the delegate will own | 314 // Shell will own the created delegate, and the delegate will own |
| 315 // the controller. | 315 // the controller. |
| 316 return new AppListViewDelegate(new AppListControllerAsh()); | 316 return new AppListViewDelegate(new AppListControllerDelegateAsh()); |
| 317 } | 317 } |
| 318 | 318 |
| 319 ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate( | 319 ash::LauncherDelegate* ChromeShellDelegate::CreateLauncherDelegate( |
| 320 ash::LauncherModel* model) { | 320 ash::LauncherModel* model) { |
| 321 ChromeLauncherController* controller = | 321 ChromeLauncherController* controller = |
| 322 new ChromeLauncherController(NULL, model); | 322 new ChromeLauncherController(NULL, model); |
| 323 controller->Init(); | 323 controller->Init(); |
| 324 return controller; | 324 return controller; |
| 325 } | 325 } |
| 326 | 326 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 ash::Shell::GetInstance()->ShowLauncher(); | 450 ash::Shell::GetInstance()->ShowLauncher(); |
| 451 break; | 451 break; |
| 452 default: | 452 default: |
| 453 NOTREACHED() << "Unexpected notification " << type; | 453 NOTREACHED() << "Unexpected notification " << type; |
| 454 } | 454 } |
| 455 #else | 455 #else |
| 456 // MSVC++ warns about switch statements without any cases. | 456 // MSVC++ warns about switch statements without any cases. |
| 457 NOTREACHED() << "Unexpected notification " << type; | 457 NOTREACHED() << "Unexpected notification " << type; |
| 458 #endif | 458 #endif |
| 459 } | 459 } |
| OLD | NEW |