Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 622893002: [Easy Unlock] Fix a DCHECK: Load localized string correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_ api.h" 5 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_ api.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 strings->SetString( 137 strings->SetString(
138 "chromebookAddedNotificationMessage", 138 "chromebookAddedNotificationMessage",
139 l10n_util::GetStringFUTF16( 139 l10n_util::GetStringFUTF16(
140 IDS_EASY_UNLOCK_CHROMEBOOK_ADDED_NOTIFICATION_MESSAGE, 140 IDS_EASY_UNLOCK_CHROMEBOOK_ADDED_NOTIFICATION_MESSAGE,
141 device_type)); 141 device_type));
142 142
143 // Setup dialog strings. 143 // Setup dialog strings.
144 // Step 1: Intro. 144 // Step 1: Intro.
145 strings->SetString( 145 strings->SetString(
146 "setupIntroHeaderTitle", 146 "setupIntroHeaderTitle",
147 l10n_util::GetStringFUTF16( 147 l10n_util::GetStringUTF16(IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TITLE));
148 IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TITLE, device_type));
149 strings->SetString( 148 strings->SetString(
150 "setupIntroHeaderText", 149 "setupIntroHeaderText",
151 l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TEXT, 150 l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TEXT,
152 device_type, 151 device_type,
153 user_email)); 152 user_email));
154 strings->SetString( 153 strings->SetString(
155 "setupIntroFindPhoneButtonLabel", 154 "setupIntroFindPhoneButtonLabel",
156 l10n_util::GetStringUTF16( 155 l10n_util::GetStringUTF16(
157 IDS_EASY_UNLOCK_SETUP_INTRO_FIND_PHONE_BUTTON_LABEL)); 156 IDS_EASY_UNLOCK_SETUP_INTRO_FIND_PHONE_BUTTON_LABEL));
158 strings->SetString( 157 strings->SetString(
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR; 573 users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
575 users[0]->data_ready = users[0]->logged_in || 574 users[0]->data_ready = users[0]->logged_in ||
576 service->GetRemoteDevices() != NULL; 575 service->GetRemoteDevices() != NULL;
577 } 576 }
578 results_ = easy_unlock_private::GetUserInfo::Results::Create(users); 577 results_ = easy_unlock_private::GetUserInfo::Results::Create(users);
579 return true; 578 return true;
580 } 579 }
581 580
582 } // namespace api 581 } // namespace api
583 } // namespace extensions 582 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698