| 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 30 matching lines...) Expand all Loading... |
| 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_impl.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/palette_delegate_chromeos.h" |
| 51 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" | 52 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
| 52 #include "chrome/browser/ui/ash/session_util.h" | 53 #include "chrome/browser/ui/ash/session_util.h" |
| 53 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 54 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 54 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" | 55 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" |
| 55 #include "chrome/browser/ui/browser.h" | 56 #include "chrome/browser/ui/browser.h" |
| 56 #include "chrome/browser/ui/browser_commands.h" | 57 #include "chrome/browser/ui/browser_commands.h" |
| 57 #include "chrome/browser/ui/browser_finder.h" | 58 #include "chrome/browser/ui/browser_finder.h" |
| 58 #include "chrome/browser/ui/browser_navigator.h" | 59 #include "chrome/browser/ui/browser_navigator.h" |
| 59 #include "chrome/browser/ui/browser_navigator_params.h" | 60 #include "chrome/browser/ui/browser_navigator_params.h" |
| 60 #include "chrome/browser/ui/browser_tabstrip.h" | 61 #include "chrome/browser/ui/browser_tabstrip.h" |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 } | 497 } |
| 497 | 498 |
| 498 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { | 499 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { |
| 499 return new ChromeNewWindowDelegate; | 500 return new ChromeNewWindowDelegate; |
| 500 } | 501 } |
| 501 | 502 |
| 502 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { | 503 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { |
| 503 return new MediaDelegateChromeOS; | 504 return new MediaDelegateChromeOS; |
| 504 } | 505 } |
| 505 | 506 |
| 507 ash::PaletteDelegate* ChromeShellDelegate::CreatePaletteDelegate() { |
| 508 return new chromeos::PaletteDelegateChromeOS(); |
| 509 } |
| 510 |
| 506 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { | 511 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { |
| 507 return chromeos::CreateSystemTrayDelegate(); | 512 return chromeos::CreateSystemTrayDelegate(); |
| 508 } | 513 } |
| 509 | 514 |
| 510 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() { | 515 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() { |
| 511 return chromeos::CreateUserWallpaperDelegate(); | 516 return chromeos::CreateUserWallpaperDelegate(); |
| 512 } | 517 } |
| 513 | 518 |
| 514 void ChromeShellDelegate::Observe(int type, | 519 void ChromeShellDelegate::Observe(int type, |
| 515 const content::NotificationSource& source, | 520 const content::NotificationSource& source, |
| (...skipping 26 matching lines...) Expand all Loading... |
| 542 NOTREACHED() << "Unexpected notification " << type; | 547 NOTREACHED() << "Unexpected notification " << type; |
| 543 } | 548 } |
| 544 } | 549 } |
| 545 | 550 |
| 546 void ChromeShellDelegate::PlatformInit() { | 551 void ChromeShellDelegate::PlatformInit() { |
| 547 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 552 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 548 content::NotificationService::AllSources()); | 553 content::NotificationService::AllSources()); |
| 549 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 554 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 550 content::NotificationService::AllSources()); | 555 content::NotificationService::AllSources()); |
| 551 } | 556 } |
| OLD | NEW |