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

Unified Diff: chrome/browser/ui/views/elevation_icon_setter.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/views/elevation_icon_setter.cc
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc
index 877ff9a32480fbac0e9fc1c34f71d20f31967509..7ad062fa22b25cbc7dcb8b82d693c88f339d27ca 100644
--- a/chrome/browser/ui/views/elevation_icon_setter.cc
+++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -24,8 +24,8 @@
namespace {
-scoped_ptr<SkBitmap> GetElevationIcon() {
- scoped_ptr<SkBitmap> icon;
+std::unique_ptr<SkBitmap> GetElevationIcon() {
+ std::unique_ptr<SkBitmap> icon;
#if defined(OS_WIN)
if ((base::win::GetVersion() < base::win::VERSION_VISTA) ||
!base::win::UserAccountControlIsEnabled())
@@ -75,7 +75,7 @@ ElevationIconSetter::~ElevationIconSetter() {
}
void ElevationIconSetter::SetButtonIcon(const base::Closure& callback,
- scoped_ptr<SkBitmap> icon) {
+ std::unique_ptr<SkBitmap> icon) {
if (icon) {
float device_scale_factor = 1.0f;
#if defined(OS_WIN)
« no previous file with comments | « chrome/browser/ui/views/elevation_icon_setter.h ('k') | chrome/browser/ui/views/exclusive_access_bubble_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698