| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "ash/accelerators/magnifier_key_scroller.h" | 9 #include "ash/accelerators/magnifier_key_scroller.h" |
| 10 #include "ash/accelerators/spoken_feedback_toggler.h" | 10 #include "ash/accelerators/spoken_feedback_toggler.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "chrome/browser/profiles/profile.h" | 37 #include "chrome/browser/profiles/profile.h" |
| 38 #include "chrome/browser/profiles/profile_manager.h" | 38 #include "chrome/browser/profiles/profile_manager.h" |
| 39 #include "chrome/browser/profiles/profiles_state.h" | 39 #include "chrome/browser/profiles/profiles_state.h" |
| 40 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" | 40 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" |
| 41 #include "chrome/browser/speech/tts_controller.h" | 41 #include "chrome/browser/speech/tts_controller.h" |
| 42 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" | 42 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" |
| 43 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" | 43 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
| 44 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" | 44 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" |
| 45 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h" | 45 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h" |
| 46 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" | 46 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" |
| 47 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 47 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" |
| 48 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 48 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
| 49 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" | 49 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" |
| 50 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 50 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| 51 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" | 51 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
| 52 #include "chrome/browser/ui/ash/session_util.h" | 52 #include "chrome/browser/ui/ash/session_util.h" |
| 53 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 53 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 54 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" | 54 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" |
| 55 #include "chrome/browser/ui/browser.h" | 55 #include "chrome/browser/ui/browser.h" |
| 56 #include "chrome/browser/ui/browser_commands.h" | 56 #include "chrome/browser/ui/browser_commands.h" |
| 57 #include "chrome/browser/ui/browser_finder.h" | 57 #include "chrome/browser/ui/browser_finder.h" |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 } | 415 } |
| 416 | 416 |
| 417 app_list::AppListPresenter* ChromeShellDelegate::GetAppListPresenter() { | 417 app_list::AppListPresenter* ChromeShellDelegate::GetAppListPresenter() { |
| 418 DCHECK(ash::Shell::HasInstance()); | 418 DCHECK(ash::Shell::HasInstance()); |
| 419 return AppListServiceAsh::GetInstance()->GetAppListPresenter(); | 419 return AppListServiceAsh::GetInstance()->GetAppListPresenter(); |
| 420 } | 420 } |
| 421 | 421 |
| 422 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( | 422 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate( |
| 423 ash::ShelfModel* model) { | 423 ash::ShelfModel* model) { |
| 424 if (!shelf_delegate_) { | 424 if (!shelf_delegate_) { |
| 425 shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model); | 425 shelf_delegate_ = |
| 426 ChromeLauncherControllerImpl::CreateInstance(nullptr, model); |
| 426 shelf_delegate_->Init(); | 427 shelf_delegate_->Init(); |
| 427 } | 428 } |
| 428 return shelf_delegate_; | 429 return shelf_delegate_; |
| 429 } | 430 } |
| 430 | 431 |
| 431 std::unique_ptr<ash::ContainerDelegate> | 432 std::unique_ptr<ash::ContainerDelegate> |
| 432 ChromeShellDelegate::CreateContainerDelegate() { | 433 ChromeShellDelegate::CreateContainerDelegate() { |
| 433 return base::WrapUnique(new ash::ContainerDelegateAura); | 434 return base::WrapUnique(new ash::ContainerDelegateAura); |
| 434 } | 435 } |
| 435 | 436 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 NOTREACHED() << "Unexpected notification " << type; | 564 NOTREACHED() << "Unexpected notification " << type; |
| 564 } | 565 } |
| 565 } | 566 } |
| 566 | 567 |
| 567 void ChromeShellDelegate::PlatformInit() { | 568 void ChromeShellDelegate::PlatformInit() { |
| 568 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 569 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 569 content::NotificationService::AllSources()); | 570 content::NotificationService::AllSources()); |
| 570 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 571 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 571 content::NotificationService::AllSources()); | 572 content::NotificationService::AllSources()); |
| 572 } | 573 } |
| OLD | NEW |