| Index: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
|
| index 104671e63b3e2473394e928769a292eafd3515ed..44065df7fa060a83f73824156421e0b389636e3d 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
|
| @@ -6,12 +6,16 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +#include <utility>
|
| +
|
| #include "ash/common/new_window_delegate.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/command_line.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/values.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chromeos/chromeos_switches.h"
|
| @@ -140,11 +144,10 @@ void KeyboardHandler::GetLocalizedValues(
|
| const input_method::ModifierKey value =
|
| kModifierKeysSelectItems[j].value;
|
| const int message_id = kModifierKeysSelectItems[j].message_id;
|
| - base::ListValue* option = new base::ListValue();
|
| - option->Append(new base::FundamentalValue(value));
|
| - option->Append(new base::StringValue(l10n_util::GetStringUTF16(
|
| - message_id)));
|
| - list_value->Append(option);
|
| + auto option = base::MakeUnique<base::ListValue>();
|
| + option->AppendInteger(value);
|
| + option->AppendString(l10n_util::GetStringUTF16(message_id));
|
| + list_value->Append(std::move(option));
|
| }
|
| localized_strings->Set(kDataValuesNames[i], list_value);
|
| }
|
|
|