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 "base/memory/ptr_util.h" | |
7 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" | 8 #include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h" |
8 | 9 |
9 StatusTray* StatusTray::Create() { | 10 StatusTray* StatusTray::Create() { |
10 return new StatusTrayMac(); | 11 return new StatusTrayMac(); |
11 } | 12 } |
12 | 13 |
13 StatusTrayMac::StatusTrayMac() { | 14 StatusTrayMac::StatusTrayMac() { |
14 } | 15 } |
15 | 16 |
16 StatusIcon* StatusTrayMac::CreatePlatformStatusIcon( | 17 std::unique_ptr<StatusIcon> StatusTrayMac::CreatePlatformStatusIcon( |
17 StatusIconType type, | 18 StatusIconType type, |
18 const gfx::ImageSkia& image, | 19 const gfx::ImageSkia& image, |
19 const base::string16& tool_tip) { | 20 const base::string16& tool_tip) { |
20 StatusIcon* icon = new StatusIconMac(); | 21 auto icon = base::MakeUnique<StatusIconMac>(); |
21 icon->SetImage(image); | 22 icon->SetImage(image); |
22 icon->SetToolTip(tool_tip); | 23 icon->SetToolTip(tool_tip); |
23 return icon; | 24 return std::move(icon); |
Lei Zhang
2017/03/23 02:59:26
<utility>
leonhsl(Using Gerrit)
2017/03/23 15:03:17
Done.
| |
24 } | 25 } |
OLD | NEW |