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

Index: chrome/browser/ui/views/translate/translate_bubble_view.h

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

index 1ffceb34deb05fdf373f27e68f0db7d3d3de1e73..37588478f14688a7bd638ac411091e0ca11203da 100644

--- a/chrome/browser/ui/views/translate/translate_bubble_view.h

+++ b/chrome/browser/ui/views/translate/translate_bubble_view.h

@@ -137,7 +137,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,

FRIEND_TEST_ALL_PREFIXES(TranslateBubbleViewTest, CancelButtonReturningError);

TranslateBubbleView(views::View* anchor_view,

- scoped_ptr<TranslateBubbleModel> model,

+ std::unique_ptr<TranslateBubbleModel> model,

translate::TranslateErrors::Type error_type,

content::WebContents* web_contents);

@@ -191,9 +191,9 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,

views::View* error_view_;

views::View* advanced_view_;

- scoped_ptr<ui::SimpleComboboxModel> denial_combobox_model_;

- scoped_ptr<LanguageComboboxModel> source_language_combobox_model_;

- scoped_ptr<LanguageComboboxModel> target_language_combobox_model_;

+ std::unique_ptr<ui::SimpleComboboxModel> denial_combobox_model_;

+ std::unique_ptr<LanguageComboboxModel> source_language_combobox_model_;

+ std::unique_ptr<LanguageComboboxModel> target_language_combobox_model_;

views::Combobox* denial_combobox_;

views::Combobox* source_language_combobox_;

@@ -204,7 +204,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,

views::LabelButton* advanced_cancel_button_;

views::LabelButton* advanced_done_button_;

- scoped_ptr<TranslateBubbleModel> model_;

+ std::unique_ptr<TranslateBubbleModel> model_;

translate::TranslateErrors::Type error_type_;