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

Unified Diff: chrome/browser/ui/views/tab_icon_view.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/tab_icon_view.cc
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index d249e5c9f7385f7d5d7e22e1193664eeee0bf925..68cf17fb9ecfd1bd7af770f2d0293ace5efd1573 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -4,13 +4,14 @@
#include "chrome/browser/ui/views/tab_icon_view.h"
+#include <memory>
+
#if defined(OS_WIN)
#include <windows.h>
#include <shellapi.h>
#endif
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/views/tab_icon_view_model.h"
@@ -44,7 +45,7 @@ void TabIconView::InitializeIfNeeded() {
// The default window icon is the application icon, not the default
// favicon.
HICON app_icon = GetAppIcon();
- scoped_ptr<SkBitmap> bitmap(
+ std::unique_ptr<SkBitmap> bitmap(
IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16)));
g_default_favicon = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));
DestroyIcon(app_icon);
« no previous file with comments | « chrome/browser/ui/views/tab_dialogs_views.cc ('k') | chrome/browser/ui/views/tab_modal_confirm_dialog_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698