chrome/browser/ui/views/status_icons/status_icon_win.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/views/status_icons/status_icon_win.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/views/status_icons/status_icon_linux_wrapper.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/status_icons/status_icon_win.h

diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h

index 9fb283c9ff5769de0f9ab40db21e0b4e4940ae83..05e45bc14723e4e3681dbb7e8c083b0770c2802a 100644

--- a/chrome/browser/ui/views/status_icons/status_icon_win.h

+++ b/chrome/browser/ui/views/status_icons/status_icon_win.h

@@ -8,9 +8,10 @@

#include <windows.h>

#include <shellapi.h>

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/win/scoped_gdi_object.h"

#include "chrome/browser/status_icons/status_icon.h"

@@ -83,7 +84,7 @@ class StatusIconWin : public StatusIcon {

ui::MenuModel* menu_model_;

// Context menu associated with this icon (if any).

- scoped_ptr<views::MenuRunner> menu_runner_;

+ std::unique_ptr<views::MenuRunner> menu_runner_;

DISALLOW_COPY_AND_ASSIGN(StatusIconWin);

};