| Index: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| index 3933864bdf07db6f9a5ba1a8be13fe68ccea7eb9..865ceac8d9f29b416167cc64049ea7cef77968ea 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc
|
| @@ -4,10 +4,6 @@
|
|
|
| #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"
|
|
|
| -#include <utility>
|
| -
|
| -#include "base/memory/ptr_util.h"
|
| -#include "base/values.h"
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
|
| #include "chrome/browser/chromeos/login/oobe_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/network_error.h"
|
| @@ -89,9 +85,10 @@
|
| data.SetBoolean("shortcutEnabled",
|
| !KioskAppManager::Get()->GetDisableBailoutShortcut());
|
|
|
| - auto app_info = base::MakeUnique<base::DictionaryValue>();
|
| - PopulateAppInfo(app_info.get());
|
| - data.Set("appInfo", std::move(app_info));
|
| + // |data| will take ownership of |app_info|.
|
| + base::DictionaryValue *app_info = new base::DictionaryValue();
|
| + PopulateAppInfo(app_info);
|
| + data.Set("appInfo", app_info);
|
|
|
| SetLaunchText(l10n_util::GetStringUTF8(GetProgressMessageFromState(state_)));
|
| ShowScreenWithData(kScreenId, &data);
|
|
|