| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/status_icons/status_tray_mac.h" | 5 #include "chrome/browser/ui/cocoa/status_icons/status_tray_mac.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 9 #include "base/memory/ptr_util.h" |
| 7 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" | 10 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" |
| 8 | 11 |
| 9 StatusTray* StatusTray::Create() { | 12 StatusTray* StatusTray::Create() { |
| 10 return new StatusTrayMac(); | 13 return new StatusTrayMac(); |
| 11 } | 14 } |
| 12 | 15 |
| 13 StatusTrayMac::StatusTrayMac() { | 16 StatusTrayMac::StatusTrayMac() { |
| 14 } | 17 } |
| 15 | 18 |
| 16 StatusIcon* StatusTrayMac::CreatePlatformStatusIcon( | 19 std::unique_ptr<StatusIcon> StatusTrayMac::CreatePlatformStatusIcon( |
| 17 StatusIconType type, | 20 StatusIconType type, |
| 18 const gfx::ImageSkia& image, | 21 const gfx::ImageSkia& image, |
| 19 const base::string16& tool_tip) { | 22 const base::string16& tool_tip) { |
| 20 StatusIcon* icon = new StatusIconMac(); | 23 auto icon = base::MakeUnique<StatusIconMac>(); |
| 21 icon->SetImage(image); | 24 icon->SetImage(image); |
| 22 icon->SetToolTip(tool_tip); | 25 icon->SetToolTip(tool_tip); |
| 23 return icon; | 26 return std::move(icon); |
| 24 } | 27 } |
| OLD | NEW |