chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.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_linux_wrapper.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_bubble_views.cc ('k') | chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.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_linux_wrapper.h

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

index d8ff6c71f3dfc8fbed9d7467912310f896668c4e..7c5791af3dfb44a22b1ed33b786dec15156f066a 100644

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

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

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_LINUX_WRAPPER_H_

#define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_LINUX_WRAPPER_H_

+#include <memory>

#include "base/macros.h"

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

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

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

#include "ui/views/linux_ui/status_icon_linux.h"

@@ -53,7 +54,7 @@ class StatusIconLinuxWrapper : public StatusIcon,

// Notification balloon.

DesktopNotificationBalloon notification_;

- scoped_ptr<views::StatusIconLinux> status_icon_;

+ std::unique_ptr<views::StatusIconLinux> status_icon_;

StatusIconMenuModel* menu_model_;