Moving It2Me confirmation prompt into the Validation callback flow

remoting/host/it2me/it2me_confirmation_dialog_chromeos.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 <memory>
+#include <string>
+
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/callback_helpers.h"
-#include "base/location.h"
+#include "base/i18n/message_formatter.h"
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/strings/utf_string_conversions.h"
 #include "remoting/base/string_resources.h"
 #include "remoting/host/chromeos/message_box.h"
 #include "remoting/host/it2me/it2me_confirmation_dialog.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace remoting {
 
 class It2MeConfirmationDialogChromeOS : public It2MeConfirmationDialog {
  public:
   It2MeConfirmationDialogChromeOS();
   ~It2MeConfirmationDialogChromeOS() override;
 
   // It2MeConfirmationDialog implementation.
-  void Show(const ResultCallback& callback) override;
+  void Show(const std::string& remote_user_email,
+            const ResultCallback& callback) override;
 
  private:
   // Handles result from |message_box_|.
   void OnMessageBoxResult(MessageBox::Result result);
 
   std::unique_ptr<MessageBox> message_box_;
   ResultCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(It2MeConfirmationDialogChromeOS);
 };
 
 It2MeConfirmationDialogChromeOS::It2MeConfirmationDialogChromeOS() {}
 
 It2MeConfirmationDialogChromeOS::~It2MeConfirmationDialogChromeOS() {}
 
-void It2MeConfirmationDialogChromeOS::Show(const ResultCallback& callback) {
+void It2MeConfirmationDialogChromeOS::Show(const std::string& remote_user_email,
+                                           const ResultCallback& callback) {
   callback_ = callback;
 
+  base::string16 dialog_message;
+  if (!remote_user_email.empty()) {

[Sergey Ulanov, 2016/09/09 18:46:57]

maybe add a TODO to remove the case when email is not specified?

[joedow, 2016/09/10 02:50:36]

I added this code in case we did not receive an email address (somehow) but
instead I will make it a requirement to have a non-empty string.  That will
simplify things a bit.

+    dialog_message = base::i18n::MessageFormatter::FormatWithNumberedArgs(
+        l10n_util::GetStringUTF16(
+            IDS_SHARE_CONFIRM_DIALOG_MESSAGE_WITH_USERNAME),
+        base::UTF8ToUTF16(remote_user_email));
+  } else {
+    dialog_message =
+        l10n_util::GetStringUTF16(IDS_SHARE_CONFIRM_DIALOG_MESSAGE);
+  }
+
   message_box_.reset(new MessageBox(
-      l10n_util::GetStringUTF16(IDS_MODE_IT2ME),
-      l10n_util::GetStringUTF16(IDS_SHARE_CONFIRM_DIALOG_MESSAGE),
+      l10n_util::GetStringUTF16(IDS_MODE_IT2ME), dialog_message,
       l10n_util::GetStringUTF16(IDS_SHARE_CONFIRM_DIALOG_CONFIRM),
       l10n_util::GetStringUTF16(IDS_SHARE_CONFIRM_DIALOG_DECLINE),
       base::Bind(&It2MeConfirmationDialogChromeOS::OnMessageBoxResult,
                  base::Unretained(this))));
 
   message_box_->Show();
 }
 
 void It2MeConfirmationDialogChromeOS::OnMessageBoxResult(
     MessageBox::Result result) {
   message_box_->Hide();
   base::ResetAndReturn(&callback_).Run(result == MessageBox::OK ?
                                        Result::OK : Result::CANCEL);
 }
 
 std::unique_ptr<It2MeConfirmationDialog>
 It2MeConfirmationDialogFactory::Create() {
   return std::unique_ptr<It2MeConfirmationDialog>(
       new It2MeConfirmationDialogChromeOS());
 }
 
 }  // namespace remoting