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

Unified Diff: chrome/browser/ui/toolbar/app_menu_icon_painter.h

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
« no previous file with comments | « chrome/browser/ui/tests/ui_gfx_image_unittest.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/app_menu_icon_painter.h
diff --git a/chrome/browser/ui/toolbar/app_menu_icon_painter.h b/chrome/browser/ui/toolbar/app_menu_icon_painter.h
index e6a6c8faa2a3b7645803b959591d762fb620c740..f0175ad5838308977552a71c7d8863b621d42b37 100644
--- a/chrome/browser/ui/toolbar/app_menu_icon_painter.h
+++ b/chrome/browser/ui/toolbar/app_menu_icon_painter.h
@@ -5,9 +5,10 @@
#ifndef CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_
#define CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_
+#include <memory>
+
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/image/image_skia.h"
@@ -72,7 +73,7 @@ class AppMenuIconPainter : gfx::AnimationDelegate {
Delegate* delegate_;
Severity severity_;
gfx::ImageSkia badge_;
- scoped_ptr<gfx::MultiAnimation> animation_;
+ std::unique_ptr<gfx::MultiAnimation> animation_;
DISALLOW_COPY_AND_ASSIGN(AppMenuIconPainter);
};
« no previous file with comments | « chrome/browser/ui/tests/ui_gfx_image_unittest.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698