chrome/browser/ui/cocoa/location_bar/page_action_decoration.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/cocoa/location_bar/page_action_decoration.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/cocoa/location_bar/manage_passwords_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/page_action_decoration.h

diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h

index 32885ec831c16e500d1f05da7c4a40b42d5e72ab..596ba1417a3a415ce995659dbba0baa8e0d97be9 100644

--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h

+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h

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

#ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_

#define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_PAGE_ACTION_DECORATION_H_

+#include <memory>

#include "base/macros.h"

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

#include "base/strings/string16.h"

#import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"

#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"

@@ -76,7 +77,7 @@ class PageActionDecoration : public ImageDecoration,

LocationBarViewMac* owner_;

// The view controller for this page action.

- scoped_ptr<ExtensionActionViewController> viewController_;

+ std::unique_ptr<ExtensionActionViewController> viewController_;

// The string to show for a tooltip.

base::scoped_nsobject<NSString> tooltip_;