| Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| index 2a7cdec67de8f4c0abf7b75889e065b4fc4a159b..2f71c1ec33da9b2816eaba8add9b3a3e205c9bbc 100644
|
| --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| @@ -5,9 +5,9 @@
|
| #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
|
|
|
| #include <math.h>
|
| -#include <set>
|
| -
|
| #include <pango/pango.h>
|
| +#include <set>
|
| +#include <utility>
|
|
|
| #include "base/command_line.h"
|
| #include "base/debug/leak_annotations.h"
|
| @@ -728,7 +728,7 @@ scoped_ptr<views::Border> Gtk2UI::CreateNativeBorder(
|
| views::LabelButton* owning_button,
|
| scoped_ptr<views::LabelButtonBorder> border) {
|
| if (owning_button->GetNativeTheme() != NativeThemeGtk2::instance())
|
| - return border.Pass();
|
| + return std::move(border);
|
|
|
| scoped_ptr<views::LabelButtonAssetBorder> gtk_border(
|
| new views::LabelButtonAssetBorder(owning_button->style()));
|
| @@ -782,7 +782,8 @@ scoped_ptr<views::Border> Gtk2UI::CreateNativeBorder(
|
| gtk_border->SetPainter(paintstate[i].focus, paintstate[i].state, painter);
|
| }
|
|
|
| - return gtk_border.Pass();;
|
| + return std::move(gtk_border);
|
| + ;
|
| }
|
|
|
| void Gtk2UI::AddWindowButtonOrderObserver(
|
|
|