chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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/ash/launcher/arc_app_window_launcher_controller.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/ash/keyboard_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

index 9c3239c3a3c4499e15bdd6c29fdf60e097cd91c7..493bcfd58af424dc9f10851484c69d780ab82e5a 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

@@ -6,9 +6,9 @@

#define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_

#include <map>

+#include <memory>

#include "base/macros.h"

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

#include "base/scoped_observer.h"

#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"

#include "mojo/public/cpp/bindings/binding.h"

@@ -41,7 +41,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,

private:

class AppWindow;

- using WindowToAppWindow = std::map<aura::Window*, scoped_ptr<AppWindow>>;

+ using WindowToAppWindow = std::map<aura::Window*, std::unique_ptr<AppWindow>>;

using AppControllerMap =

std::map<std::string, ArcAppWindowLauncherItemController*>;