| Index: ash/system/chromeos/session/logout_button_tray.cc
|
| diff --git a/ash/system/chromeos/session/logout_button_tray.cc b/ash/system/chromeos/session/logout_button_tray.cc
|
| index 1b7addcb1acaf9fc50cca5fdff5b2e6b6999acbc..f076e8c3f5578969ea9223bb18129148353892fb 100644
|
| --- a/ash/system/chromeos/session/logout_button_tray.cc
|
| +++ b/ash/system/chromeos/session/logout_button_tray.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/system/chromeos/session/logout_button_tray.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ash/shelf/shelf_types.h"
|
| #include "ash/shell.h"
|
| #include "ash/system/chromeos/session/logout_confirmation_controller.h"
|
| @@ -83,7 +85,7 @@ LogoutButton::LogoutButton(views::ButtonListener* listener)
|
| insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding,
|
| 0, kLogoutButtonHorizontalExtraPadding);
|
| border->set_insets(insets);
|
| - SetBorder(border.Pass());
|
| + SetBorder(std::move(border));
|
| set_animate_on_state_change(false);
|
|
|
| SetMinSize(gfx::Size(0, kShelfItemHeight));
|
|
|