extensions/shell/browser/shell_desktop_controller_mac.h - Issue 1908953003: Convert //extensions/{common,shell} 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: extensions/shell/browser/shell_desktop_controller_mac.h

Issue 1908953003: Convert //extensions/{common,shell} 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 | « extensions/shell/browser/shell_desktop_controller_aura_unittest.cc ('k') | extensions/shell/browser/shell_device_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/browser/shell_desktop_controller_mac.h

diff --git a/extensions/shell/browser/shell_desktop_controller_mac.h b/extensions/shell/browser/shell_desktop_controller_mac.h

index dda610c7fe7289c5c4c7a7715bfc7078c7c9d98f..b3e7e750604af3c9bde578cfc9e8beafb74ac594 100644

--- a/extensions/shell/browser/shell_desktop_controller_mac.h

+++ b/extensions/shell/browser/shell_desktop_controller_mac.h

@@ -5,10 +5,10 @@

#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_MAC_H_

#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_MAC_H_

-#include "extensions/shell/browser/desktop_controller.h"

+#include <memory>

#include "base/macros.h"

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

+#include "extensions/shell/browser/desktop_controller.h"

namespace extensions {

@@ -31,7 +31,7 @@ class ShellDesktopControllerMac : public DesktopController {

void CloseAppWindows() override;

private:

- scoped_ptr<AppWindowClient> app_window_client_;

+ std::unique_ptr<AppWindowClient> app_window_client_;

// The desktop only supports a single app window.

// TODO(yoz): Support multiple app windows, as we do in Aura.