| Index: components/proximity_auth/screenlock_bridge.cc
|
| diff --git a/components/proximity_auth/screenlock_bridge.cc b/components/proximity_auth/screenlock_bridge.cc
|
| index 891c9d1675f9718cd3055d9fdf5ec53e087c3275..f0cc8c40324756eb8236308f34ef0fda7a15459c 100644
|
| --- a/components/proximity_auth/screenlock_bridge.cc
|
| +++ b/components/proximity_auth/screenlock_bridge.cc
|
| @@ -67,8 +67,7 @@ ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {
|
| std::unique_ptr<base::DictionaryValue>
|
| ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
|
| auto result = base::MakeUnique<base::DictionaryValue>();
|
| - std::string icon_id = GetIdForIcon(icon_);
|
| - result->SetString("id", icon_id);
|
| + result->SetString("id", GetIDString());
|
|
|
| if (!tooltip_.empty()) {
|
| auto tooltip_options = base::MakeUnique<base::DictionaryValue>();
|
| @@ -114,6 +113,10 @@ void ScreenlockBridge::UserPodCustomIconOptions::SetTrialRun() {
|
| is_trial_run_ = true;
|
| }
|
|
|
| +std::string ScreenlockBridge::UserPodCustomIconOptions::GetIDString() const {
|
| + return GetIdForIcon(icon_);
|
| +}
|
| +
|
| // static
|
| ScreenlockBridge* ScreenlockBridge::Get() {
|
| return g_screenlock_bridge_instance.Pointer();
|
|
|