| 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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { | 546 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { |
| 547 return new SessionStateDelegateChromeos; | 547 return new SessionStateDelegateChromeos; |
| 548 } | 548 } |
| 549 | 549 |
| 550 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { | 550 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { |
| 551 return new AccessibilityDelegateImpl; | 551 return new AccessibilityDelegateImpl; |
| 552 } | 552 } |
| 553 | 553 |
| 554 std::unique_ptr<ash::PaletteDelegate> | 554 std::unique_ptr<ash::PaletteDelegate> |
| 555 ChromeShellDelegate::CreatePaletteDelegate() { | 555 ChromeShellDelegate::CreatePaletteDelegate() { |
| 556 return chromeos::PaletteDelegateChromeOS::Create(); | 556 return base::MakeUnique<chromeos::PaletteDelegateChromeOS>(); |
| 557 } | 557 } |
| 558 | 558 |
| 559 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { | 559 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { |
| 560 return chromeos::CreateSystemTrayDelegate(); | 560 return chromeos::CreateSystemTrayDelegate(); |
| 561 } | 561 } |
| 562 | 562 |
| 563 std::unique_ptr<ash::WallpaperDelegate> | 563 std::unique_ptr<ash::WallpaperDelegate> |
| 564 ChromeShellDelegate::CreateWallpaperDelegate() { | 564 ChromeShellDelegate::CreateWallpaperDelegate() { |
| 565 return base::WrapUnique(chromeos::CreateWallpaperDelegate()); | 565 return base::WrapUnique(chromeos::CreateWallpaperDelegate()); |
| 566 } | 566 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 594 NOTREACHED() << "Unexpected notification " << type; | 594 NOTREACHED() << "Unexpected notification " << type; |
| 595 } | 595 } |
| 596 } | 596 } |
| 597 | 597 |
| 598 void ChromeShellDelegate::PlatformInit() { | 598 void ChromeShellDelegate::PlatformInit() { |
| 599 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 599 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 600 content::NotificationService::AllSources()); | 600 content::NotificationService::AllSources()); |
| 601 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, | 601 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, |
| 602 content::NotificationService::AllSources()); | 602 content::NotificationService::AllSources()); |
| 603 } | 603 } |
| OLD | NEW |