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

Index: chrome/browser/ui/views/website_settings/permission_selector_view.h

diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h

index 0f9836c5a9687ef522f0bab5dd6769f0d910876c..8ad03efa0789634b423bef0276156821dbd5953b 100644

--- a/chrome/browser/ui/views/website_settings/permission_selector_view.h

+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h

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

#ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_

#define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/observer_list.h"

#include "base/strings/string16.h"

#include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"

@@ -46,7 +47,7 @@ class PermissionSelectorView : public views::View {

~PermissionSelectorView() override;

// Model for the permission's menu.

- scoped_ptr<PermissionMenuModel> menu_model_;

+ std::unique_ptr<PermissionMenuModel> menu_model_;

views::ImageView* icon_; // Owned by the views hierachy.

internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy.