[Easy Unlock] Update strings to inform users about Bluetooth use and to tell a clearer story.

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/common/extensions/api/easy_unlock_private.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/proximity_auth/bluetooth_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chromeos_utils.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #endif
 
 namespace extensions {
 namespace api {
 
 namespace {
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 58 matching lines @@
 bool EasyUnlockPrivateGetStringsFunction::RunSync() {
   scoped_ptr<base::DictionaryValue> strings(new base::DictionaryValue);
 
 #if defined(OS_CHROMEOS)
   const base::string16 device_type = chromeos::GetChromeDeviceType();
 #else
   // TODO(isherman): Set an appropriate device name for non-ChromeOS devices.
   const base::string16 device_type = base::ASCIIToUTF16("Chromeschnozzle");
 #endif  // defined(OS_CHROMEOS)
 
+#if defined(OS_CHROMEOS)
+  const user_manager::UserManager* manager = user_manager::UserManager::Get();
+  const user_manager::User* user = manager ? manager->GetActiveUser() : NULL;
+  const std::string user_email_utf8 =
+      user ? user->display_email() : std::string();
+  const base::string16 user_email = base::UTF8ToUTF16(user_email_utf8);
+#else
+  // TODO(isherman): Set an appropriate user display email for non-ChromeOS
+  // platforms.
+  const base::string16 user_email = base::UTF8ToUTF16("superman@example.com");
+#endif  // defined(OS_CHROMEOS)
+
   // Common strings.
   strings->SetString(
       "learnMoreLinkTitle",
       l10n_util::GetStringUTF16(IDS_EASY_UNLOCK_LEARN_MORE_LINK_TITLE));
 
   // Setup notification strings.
   strings->SetString(
       "setupNotificationTitle",
       l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_NOTIFICATION_TITLE,
                                  device_type));
@@ skipping 27 matching lines @@
           device_type));
 
   // Setup dialog strings.
   // Step 1: Intro.
   strings->SetString(
       "setupIntroHeaderTitle",
       l10n_util::GetStringFUTF16(
           IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TITLE, device_type));
   strings->SetString(
       "setupIntroHeaderText",
-      l10n_util::GetStringFUTF16(
-          IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TEXT, device_type));
-  strings->SetString(
-      "setupIntroHeaderFootnote",
-      l10n_util::GetStringUTF16(
-          IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_FOOTNOTE));
+      l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_INTRO_HEADER_TEXT,
+                                 device_type,
+                                 user_email));
   strings->SetString(
       "setupIntroFindPhoneButtonLabel",
       l10n_util::GetStringUTF16(
           IDS_EASY_UNLOCK_SETUP_INTRO_FIND_PHONE_BUTTON_LABEL));
   strings->SetString(
       "setupIntroFindingPhoneButtonLabel",
       l10n_util::GetStringUTF16(
           IDS_EASY_UNLOCK_SETUP_INTRO_FINDING_PHONE_BUTTON_LABEL));
   strings->SetString(
       "setupIntroRetryFindPhoneButtonLabel",
@@ skipping 62 matching lines @@
            device_type));
   strings->SetString(
       "setupErrorSyncPhoneState",
        l10n_util::GetStringUTF16(
            IDS_EASY_UNLOCK_SETUP_ERROR_SYNC_PHONE_STATE_FAILED));
   strings->SetString(
       "setupErrorConnectingToPhone",
       l10n_util::GetStringFUTF16(
           IDS_EASY_UNLOCK_SETUP_ERROR_CONNECTING_TO_PHONE, device_type));
 
-  // TODO(isherman): Remove these strings once the app has been updated.
-  strings->SetString(
-      "notificationTitle",
-      l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_NOTIFICATION_TITLE,
-                                 device_type));
-  strings->SetString(
-      "notificationMessage",
-      l10n_util::GetStringFUTF16(IDS_EASY_UNLOCK_SETUP_NOTIFICATION_MESSAGE,
-                                 device_type));
-  strings->SetString(
-      "notificationButtonTitle",
-      l10n_util::GetStringUTF16(
-          IDS_EASY_UNLOCK_SETUP_NOTIFICATION_BUTTON_TITLE));
+  // TODO(isherman): Remove this string once the app has been updated.
+  strings->SetString("setupIntroHeaderFootnote", base::string16());
 
   SetResult(strings.release());
   return true;
 }
 
 EasyUnlockPrivatePerformECDHKeyAgreementFunction::
 EasyUnlockPrivatePerformECDHKeyAgreementFunction() {}
 
 EasyUnlockPrivatePerformECDHKeyAgreementFunction::
 ~EasyUnlockPrivatePerformECDHKeyAgreementFunction() {}
@@ skipping 324 matching lines @@
     users[0]->user_id = user_id;
     users[0]->logged_in = service->GetType() == EasyUnlockService::TYPE_REGULAR;
     users[0]->data_ready = service->GetRemoteDevices() != NULL;
   }
   results_ = easy_unlock_private::GetUserInfo::Results::Create(users);
   return true;
 }
 
 }  // namespace api
 }  // namespace extensions