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

Index: chrome/browser/ui/views/menu_test_base.h

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

index 951df77bd4afc540a02cbfa534506a9d28c71afa..15314243bfd84bafff58361359494cc73bc901cf 100644

--- a/chrome/browser/ui/views/menu_test_base.h

+++ b/chrome/browser/ui/views/menu_test_base.h

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

#ifndef CHROME_BROWSER_UI_VIEWS_MENU_TEST_BASE_H_

#define CHROME_BROWSER_UI_VIEWS_MENU_TEST_BASE_H_

+#include <memory>

#include "base/callback.h"

#include "base/macros.h"

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

#include "chrome/test/base/view_event_test_base.h"

#include "ui/events/keycodes/keyboard_codes.h"

#include "ui/views/controls/button/menu_button_listener.h"

@@ -83,7 +84,7 @@ class MenuTestBase : public ViewEventTestBase,

private:

views::MenuButton* button_;

views::MenuItemView* menu_;

- scoped_ptr<views::MenuRunner> menu_runner_;

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

// The command id of the last pressed menu item since the menu was opened.

int last_command_;