| Index: chrome/browser/ui/panels/panel_manager.cc
|
| diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
|
| index 06c1762a0ca8cc1cc524aaf734f01d54d572c62b..7d2c9cec5a78d650b69545e879eab81a9327f98c 100644
|
| --- a/chrome/browser/ui/panels/panel_manager.cc
|
| +++ b/chrome/browser/ui/panels/panel_manager.cc
|
| @@ -4,10 +4,11 @@
|
|
|
| #include "chrome/browser/ui/panels/panel_manager.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -155,7 +156,7 @@ bool PanelManager::CanUseSystemMinimize() {
|
| static base::nix::DesktopEnvironment desktop_env =
|
| base::nix::DESKTOP_ENVIRONMENT_OTHER;
|
| if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_OTHER) {
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + std::unique_ptr<base::Environment> env(base::Environment::Create());
|
| desktop_env = base::nix::GetDesktopEnvironment(env.get());
|
| }
|
| return desktop_env != base::nix::DESKTOP_ENVIRONMENT_UNITY;
|
|
|