| Index: chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| index 84408c2d15e674b4d4c43a669ca3760e3a6bc245..d8041d426868cb21f4dca63034f7b44442ad63e2 100644
|
| --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
|
| @@ -5,9 +5,9 @@
|
| #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <algorithm>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/i18n/string_compare.h"
|
| @@ -116,11 +116,9 @@ void TranslateBubbleView::ShowBubble(
|
| source_language,
|
| target_language));
|
| scoped_ptr<TranslateBubbleModel> model(
|
| - new TranslateBubbleModelImpl(step, ui_delegate.Pass()));
|
| - TranslateBubbleView* view = new TranslateBubbleView(anchor_view,
|
| - model.Pass(),
|
| - error_type,
|
| - web_contents);
|
| + new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
|
| + TranslateBubbleView* view = new TranslateBubbleView(
|
| + anchor_view, std::move(model), error_type, web_contents);
|
| views::BubbleDelegateView::CreateBubble(view);
|
| view->ShowForReason(reason);
|
| }
|
| @@ -260,7 +258,7 @@ TranslateBubbleView::TranslateBubbleView(
|
| always_translate_checkbox_(NULL),
|
| advanced_cancel_button_(NULL),
|
| advanced_done_button_(NULL),
|
| - model_(model.Pass()),
|
| + model_(std::move(model)),
|
| error_type_(error_type),
|
| is_in_incognito_window_(
|
| web_contents ? web_contents->GetBrowserContext()->IsOffTheRecord()
|
|
|