Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Unified Diff: ui/app_list/views/speech_view.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/app_list/views/speech_view.h ('k') | ui/app_list/views/tile_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/speech_view.cc
diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc
index d0679ec06b8c3caddaa4a393a9cb4c891eed7616..7cb354aa659e896967d3684180000718a9501ffb 100644
--- a/ui/app_list/views/speech_view.cc
+++ b/ui/app_list/views/speech_view.cc
@@ -114,7 +114,7 @@ bool MicButton::GetHitTestMask(gfx::Path* mask) const {
SpeechView::SpeechView(AppListViewDelegate* delegate)
: delegate_(delegate),
logo_(NULL) {
- SetBorder(scoped_ptr<views::Border>(
+ SetBorder(std::unique_ptr<views::Border>(
new views::ShadowBorder(GetShadowForZHeight(1))));
// To keep the painting order of the border and the background, this class
@@ -138,8 +138,8 @@ SpeechView::SpeechView(AppListViewDelegate* delegate)
MicButton* mic_button = new MicButton(this);
mic_button_ = mic_button;
container->AddChildView(mic_button_);
- mic_button_->SetEventTargeter(
- scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(mic_button)));
+ mic_button_->SetEventTargeter(std::unique_ptr<views::ViewTargeter>(
+ new views::ViewTargeter(mic_button)));
// TODO(mukai): use BoundedLabel to cap 2 lines.
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
« no previous file with comments | « ui/app_list/views/speech_view.h ('k') | ui/app_list/views/tile_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698