| 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 <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { | 529 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { |
| 530 return new SessionStateDelegateChromeos; | 530 return new SessionStateDelegateChromeos; |
| 531 } | 531 } |
| 532 | 532 |
| 533 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { | 533 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { |
| 534 return new AccessibilityDelegateImpl; | 534 return new AccessibilityDelegateImpl; |
| 535 } | 535 } |
| 536 | 536 |
| 537 std::unique_ptr<ash::PaletteDelegate> | 537 std::unique_ptr<ash::PaletteDelegate> |
| 538 ChromeShellDelegate::CreatePaletteDelegate() { | 538 ChromeShellDelegate::CreatePaletteDelegate() { |
| 539 return chromeos::PaletteDelegateChromeOS::Create(); | 539 return base::MakeUnique<chromeos::PaletteDelegateChromeOS>(); |
| 540 } | 540 } |
| 541 | 541 |
| 542 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { | 542 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { |
| 543 return chromeos::CreateSystemTrayDelegate(); | 543 return chromeos::CreateSystemTrayDelegate(); |
| 544 } | 544 } |
| 545 | 545 |
| 546 std::unique_ptr<ash::WallpaperDelegate> | 546 std::unique_ptr<ash::WallpaperDelegate> |
| 547 ChromeShellDelegate::CreateWallpaperDelegate() { | 547 ChromeShellDelegate::CreateWallpaperDelegate() { |
| 548 return base::WrapUnique(chromeos::CreateWallpaperDelegate()); | 548 return base::WrapUnique(chromeos::CreateWallpaperDelegate()); |
| 549 } | 549 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 577 NOTREACHED() << "Unexpected notification " << type; | 577 NOTREACHED() << "Unexpected notification " << type; |
| 578 } | 578 } |
| 579 } | 579 } |
| 580 | 580 |
| 581 void ChromeShellDelegate::PlatformInit() { | 581 void ChromeShellDelegate::PlatformInit() { |
| 582 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 582 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 583 content::NotificationService::AllSources()); | 583 content::NotificationService::AllSources()); |
| 584 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 584 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 585 content::NotificationService::AllSources()); | 585 content::NotificationService::AllSources()); |
| 586 } | 586 } |
| OLD | NEW |