Display local signin error without browser and record the path of selected profile in user manager.

chrome/browser/ui/views/profiles/user_manager_view.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/ui/views/profiles/user_manager_view.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/user_manager.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
@@ skipping 24 matching lines @@
 ReauthDelegate::ReauthDelegate(UserManagerView* parent,
                                views::WebView* web_view,
                                const std::string& email_address,
                                signin_metrics::Reason reason)
     : parent_(parent),
       web_view_(web_view),
       email_address_(email_address) {
   AddChildView(web_view_);
   SetLayoutManager(new views::FillLayout());
 
-  web_view->GetWebContents()->SetDelegate(this);
+  web_view_->GetWebContents()->SetDelegate(this);
 
   // Load the re-auth URL, prepopulated with the user's email address.
   // Add the index of the profile to the URL so that the inline login page
   // knows which profile to load and update the credentials.
   GURL url = signin::GetReauthURLWithEmail(
       signin_metrics::AccessPoint::ACCESS_POINT_USER_MANAGER, reason,
       email_address_);
   web_view_->LoadInitialURL(url);
 }
 
 ReauthDelegate::~ReauthDelegate() {}
 
 gfx::Size ReauthDelegate::GetPreferredSize() const {
   return switches::UsePasswordSeparatedSigninFlow() ?
       gfx::Size(UserManager::kReauthDialogWidth,
                 UserManager::kReauthDialogHeight) :
       gfx::Size(UserManager::kPasswordCombinedReauthDialogWidth,
                 UserManager::kPasswordCombinedReauthDialogHeight);
 }
 
+void ReauthDelegate::DisplayErrorMessage() {
+  web_view_->LoadInitialURL(GURL(chrome::kChromeUISigninErrorURL));
+}
+
 bool ReauthDelegate::CanResize() const {
   return true;
 }
 
 bool ReauthDelegate::CanMaximize() const  {
   return true;
 }
 
 bool ReauthDelegate::CanMinimize() const  {
   return true;
@@ skipping 103 matching lines @@
   }
 }
 
 // static
 void UserManager::ShowReauthDialog(content::BrowserContext* browser_context,
                                    const std::string& email,
                                    signin_metrics::Reason reason) {
   // This method should only be called if the user manager is already showing.
   if (!IsShowing())
     return;
-
   instance_->ShowReauthDialog(browser_context, email, reason);
 }
 
 // static
 void UserManager::HideReauthDialog() {
   // This method should only be called if the user manager is already showing.
-  if (!IsShowing())
-    return;
-
-  instance_->HideReauthDialog();
+  if (instance_ && !instance_->GetWidget()->IsClosed())

[sky, 2016/09/20 23:30:19]

Can you motivate why this change is needed?

[zmin, 2016/09/21 00:09:35]

IsShowing will check the activate of User Manager window.
bool UserManager::IsShowing() {
 return instance_ ? instance_->GetWidget()->IsActive() : false;	 194   return
instance_ ? instance_->GetWidget()->IsActive() : false; }}

However, it's not true when gaia window(ReauthDialog) popup. Because when gaia
window(ReauthDialog) displayed, the user manager window will behind the gaia
window(ReauthDialog) and not activate and I can't call this function to hide the
dialog.

[sky, 2016/09/21 23:00:02]

I think you are arguing for checking IsVisible(), which makes sense.

+    instance_->HideReauthDialog();
 }
 
 // static
 void UserManager::AddOnUserManagerShownCallbackForTesting(
     const base::Closure& callback) {
   DCHECK(!user_manager_shown_callback_for_testing_);
   user_manager_shown_callback_for_testing_ = new base::Closure(callback);
 }
 
+// static
+void UserManager::ShowSigninDialog(content::BrowserContext* browser_context,
+                                   const base::FilePath profile_path) {
+  instance_->SetSigninProfilePath(profile_path);

[sky, 2016/09/20 23:30:19]

How do you know instance_ is non-null at the time this is called?

[zmin, 2016/09/21 00:09:35]

Good catch, I shall add a check here.

[zmin, 2016/09/21 16:40:04]

Done.

+  ShowReauthDialog(browser_context, std::string(),

[sky, 2016/09/20 23:30:19]

As someone not intimitely familiar with this code I find it confusing that
ShowSigninDialog calls ShowReauthDialog. Is there a reason we can't have a
single ShowReauthDialog with the appropriate details?

[zmin, 2016/09/21 00:09:35]

User manager only has ShowReauthDialog before because all sign in in User
Manager are reauth. However, it's not true anymore with force sign in which is
the reason I create ShowSigninDialog. But I call ShowReauthDialog inside the
ShowSigninDialog to avoid code copy.

[zmin, 2016/09/21 02:56:08]

I think it's more clear for the API or it will become "It's not reauth but fresh
sign in, why call UserManager::ShowReauthDialog()?" Another solution is change
the name of ShowReauthDialog but that is not a simply refactor.

+                   signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT);
+}
+
+// static
+void UserManager::DisplayErrorMessage() {
+  // This method should only be called if the user manager is already showing.
+  if (instance_)
+    instance_->DisplayErrorMessage();
+}
+
+// static
+base::FilePath UserManager::GetSigninProfilePath() {
+  return instance_->GetSigninProfilePath();
+}
+
 // UserManagerView -------------------------------------------------------------
 
 UserManagerView::UserManagerView()
     : web_view_(nullptr),
       delegate_(nullptr),
-      user_manager_started_showing_(base::Time()) {
+      user_manager_started_showing_(base::Time()),
+      signin_profile_path_(base::FilePath()) {

[sky, 2016/09/20 23:30:19]

This is the default, so you don't need it.

[zmin, 2016/09/21 16:40:04]

Done.

   keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::USER_MANAGER_VIEW,
                                         KeepAliveRestartOption::DISABLED));
 }
 
 UserManagerView::~UserManagerView() {
   HideReauthDialog();
 }
 
 // static
 void UserManagerView::OnSystemProfileCreated(
@@ skipping 25 matching lines @@
   delegate_->GetWidget()->Show();
 }
 
 void UserManagerView::HideReauthDialog() {
   if (delegate_) {
     delegate_->CloseReauthDialog();
     DCHECK(!delegate_);
   }
 }
 
+void UserManagerView::DisplayErrorMessage() {

[sky, 2016/09/20 23:30:19]

Style guide says declaration and definition order should match.

[zmin, 2016/09/21 16:40:04]

Done.

+  if (delegate_) {

[sky, 2016/09/20 23:30:19]

no {}

[zmin, 2016/09/21 16:40:04]

Done.

+    delegate_->DisplayErrorMessage();
+  }
+}
+
 void UserManagerView::OnReauthDialogDestroyed() {
   delegate_ = nullptr;
 }
 
 void UserManagerView::Init(Profile* system_profile, const GURL& url) {
   web_view_ = new views::WebView(system_profile);
   web_view_->set_allow_accelerators(true);
   AddChildView(web_view_);
   SetLayoutManager(new views::FillLayout);
   AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
@@ skipping 107 matching lines @@
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool UserManagerView::ShouldUseCustomFrame() const {
   return false;
 }
+
+void UserManagerView::SetSigninProfilePath(const base::FilePath profile_path) {
+  signin_profile_path_ = profile_path;
+}
+
+base::FilePath UserManagerView::GetSigninProfilePath() {
+  return signin_profile_path_;
+}