Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3671)

Unified Diff: ash/system/chromeos/power/tray_power.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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
« no previous file with comments | « ash/system/chromeos/power/power_status_view_unittest.cc ('k') | ash/system/chromeos/power/tray_power.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/power/tray_power.h
diff --git a/ash/system/chromeos/power/tray_power.h b/ash/system/chromeos/power/tray_power.h
index 6ecd06a0d507b3684ba3b5b88bd4d093f3f3f4f8..2f32cd7f43b8d69b23b824442ca96fcb469c3cff 100644
--- a/ash/system/chromeos/power/tray_power.h
+++ b/ash/system/chromeos/power/tray_power.h
@@ -5,6 +5,8 @@
#ifndef ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
#define ASH_SYSTEM_CHROMEOS_POWER_TRAY_POWER_H_
+#include <memory>
+
#include "ash/system/chromeos/power/power_status.h"
#include "ash/system/tray/system_tray_item.h"
#include "base/macros.h"
@@ -99,8 +101,8 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
message_center::MessageCenter* message_center_; // Not owned.
tray::PowerTrayView* power_tray_;
- scoped_ptr<BatteryNotification> battery_notification_;
- scoped_ptr<DualRoleNotification> dual_role_notification_;
+ std::unique_ptr<BatteryNotification> battery_notification_;
+ std::unique_ptr<DualRoleNotification> dual_role_notification_;
NotificationState notification_state_;
// Was a USB charger connected the last time OnPowerStatusChanged() was
« no previous file with comments | « ash/system/chromeos/power/power_status_view_unittest.cc ('k') | ash/system/chromeos/power/tray_power.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698