| Index: chrome/browser/ui/views/status_icons/status_tray_linux.cc
|
| diff --git a/chrome/browser/ui/views/status_icons/status_tray_linux.cc b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
|
| index 5b7b612c742449995d36d684ffbbf0e6c1863056..a06731f52ec2ddff066e0b1a05f5d22c0b60ae66 100644
|
| --- a/chrome/browser/ui/views/status_icons/status_tray_linux.cc
|
| +++ b/chrome/browser/ui/views/status_icons/status_tray_linux.cc
|
| @@ -16,7 +16,7 @@ StatusTrayLinux::StatusTrayLinux() {
|
| StatusTrayLinux::~StatusTrayLinux() {
|
| }
|
|
|
| -StatusIcon* StatusTrayLinux::CreatePlatformStatusIcon(
|
| +std::unique_ptr<StatusIcon> StatusTrayLinux::CreatePlatformStatusIcon(
|
| StatusIconType type,
|
| const gfx::ImageSkia& image,
|
| const base::string16& tool_tip) {
|
| @@ -29,10 +29,10 @@ StatusTray* StatusTray::Create() {
|
| // Only create a status tray if we can actually create status icons.
|
| if (linux_ui && linux_ui->IsStatusIconSupported())
|
| return new StatusTrayLinux();
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| #else // defined(OS_CHROMEOS)
|
| StatusTray* StatusTray::Create() {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| #endif
|
|
|