chrome/browser/ui/app_list/arc/arc_app_icon_loader.h - Issue 1865213004: Convert //chrome/browser/ui 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: chrome/browser/ui/app_list/arc/arc_app_icon_loader.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

Index: chrome/browser/ui/app_list/arc/arc_app_icon_loader.h

diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon_loader.h b/chrome/browser/ui/app_list/arc/arc_app_icon_loader.h

index a56bb4de45bfc7ee994b7ead34850237367a03b1..37bad2c51870a0901c56b392d6c1f5c4e8063240 100644

--- a/chrome/browser/ui/app_list/arc/arc_app_icon_loader.h

+++ b/chrome/browser/ui/app_list/arc/arc_app_icon_loader.h

@@ -6,10 +6,10 @@

#define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_ICON_LOADER_H_

#include <map>

+#include <memory>

#include <string>

#include "base/macros.h"

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

#include "chrome/browser/ui/app_icon_loader.h"

#include "chrome/browser/ui/app_list/arc/arc_app_icon.h"

#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

@@ -40,7 +40,7 @@ class ArcAppIconLoader : public AppIconLoader,

void OnIconUpdated(ArcAppIcon* icon) override;

private:

- using AppIDToIconMap = std::map<std::string, scoped_ptr<ArcAppIcon>>;

+ using AppIDToIconMap = std::map<std::string, std::unique_ptr<ArcAppIcon>>;

// Unowned pointer.

ArcAppListPrefs* arc_prefs_;

« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_icon.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_icon_loader.cc » ('j') | no next file with comments »