ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ash/system/chromeos/audio/tray_audio_chromeos.h ('K') | « ash/system/chromeos/audio/tray_audio_chromeos.cc ('k') | ash/system/chromeos/brightness/tray_brightness_unittest.cc » ('j') | ash/system/chromeos/brightness/tray_brightness_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc

diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc

index eb12ea7f129cd6b47fa28170dc0f9d4d2efe24e1..42f8fb3d459b43f85f96f4a5eec8bb3939464d22 100644

--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc

+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc

@@ -4,13 +4,13 @@

#include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"

+#include <memory>

#include <utility>

#include "ash/system/system_notifier.h"

#include "base/bind.h"

#include "base/callback.h"

#include "base/logging.h"

-#include "base/memory/scoped_ptr.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "device/bluetooth/bluetooth_adapter_factory.h"

@@ -274,7 +274,7 @@ void BluetoothNotificationController::NotifyAdapterDiscoverable() {

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

- scoped_ptr<Notification> notification(new Notification(

+ std::unique_ptr<Notification> notification(new Notification(

message_center::NOTIFICATION_TYPE_SIMPLE,

kBluetoothDeviceDiscoverableNotificationId, base::string16() /* title */,

l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERABLE,

@@ -305,7 +305,7 @@ void BluetoothNotificationController::NotifyPairing(

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

- scoped_ptr<Notification> notification(new Notification(

+ std::unique_ptr<Notification> notification(new Notification(

message_center::NOTIFICATION_TYPE_SIMPLE,

kBluetoothDevicePairingNotificationId, base::string16() /* title */,

message, bundle.GetImageNamed(IDR_AURA_NOTIFICATION_BLUETOOTH),

@@ -330,7 +330,7 @@ void BluetoothNotificationController::NotifyPairedDevice(

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

- scoped_ptr<Notification> notification(new Notification(

+ std::unique_ptr<Notification> notification(new Notification(

message_center::NOTIFICATION_TYPE_SIMPLE,

kBluetoothDevicePairedNotificationId, base::string16() /* title */,

l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED,