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

chrome/browser/ui/cocoa/profiles/user_manager_mac.mm

 // 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/cocoa/profiles/user_manager_mac.h"
 
 #include "base/callback.h"
 #include "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_process.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/profiles_state.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 #include "chrome/browser/ui/user_manager.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/base/l10n/l10n_util_mac.h"
@@ skipping 10 matching lines @@
     AppController* controller =
         base::mac::ObjCCast<AppController>([NSApp delegate]);
     [controller windowChangedToProfile:profile];
   }
 }
 
 }  // namespace
 
 // An open User Manager window. There can only be one open at a time. This
 // is reset to NULL when the window is closed.
 UserManagerMac* instance_ = nullptr;  // Weak.

[tapted, 2016/10/17 05:28:20]

eep! This was very confusing - these are not instance variables, but globals.

Let's at least move them into an anonymous namespace... Move line 51 down - you
should be able to put it just before `@interface ReauthDialogWindowController`
around line 173

But really they need to be renamed to g_instance or similar (or not be globals
at all...)

 std::vector<base::Closure>* user_manager_shown_callbacks_for_testing_ = nullptr;
 BOOL instance_under_construction_ = NO;
 
 void CloseInstanceReauthDialog() {
   DCHECK(instance_);
   instance_->CloseReauthDialog();
 }
 
 // The modal dialog host the User Manager uses to display the reauth dialog.
 class UserManagerModalHost : public web_modal::WebContentsModalDialogHost {
@@ skipping 93 matching lines @@
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override {
     hotKeysWebContentsDelegate_->HandleKeyboardEvent(source, event);
   }
 
   // ConstrainedWindowMacDelegate:
   void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
     CloseReauthDialog();
   }
 
-private:
+ private:
   std::unique_ptr<UserManagerWebContentsDelegate> hotKeysWebContentsDelegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ReauthDialogDelegate);
 };
 
 // WindowController for the reauth dialog.
 @interface ReauthDialogWindowController
     : NSWindowController <NSWindowDelegate> {
  @private
   std::string emailAddress_;
   content::WebContents* webContents_;
   signin_metrics::Reason reason_;
   std::unique_ptr<ReauthDialogDelegate> webContentsDelegate_;
   std::unique_ptr<ConstrainedWindowMac> constrained_window_;
   std::unique_ptr<content::WebContents> reauthWebContents_;
 }
 - (id)initWithProfile:(Profile*)profile
                 email:(std::string)email
                reason:(signin_metrics::Reason)reason
           webContents:(content::WebContents*)webContents;
+- (void)showURL:(const GURL&)url;
 - (void)close;
 @end
 
 @implementation ReauthDialogWindowController
 
 - (id)initWithProfile:(Profile*)profile
                 email:(std::string)email
                reason:(signin_metrics::Reason)reason
           webContents:(content::WebContents*)webContents {
   webContents_ = webContents;
@@ skipping 27 matching lines @@
     // it in the title bar and change its action.
     auto closeButton = [window standardWindowButton:NSWindowCloseButton];
     [closeButton setTarget:self];
     [closeButton setAction:@selector(closeButtonClicked:)];
     [self show];
   }
 
   return self;
 }
 
+- (void)showURL:(const GURL&)url {
+  reauthWebContents_->GetController().LoadURL(url, content::Referrer(),
+                                              ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                              std::string());
+}
+
 - (void)show {
   GURL url = signin::GetReauthURLWithEmail(
       signin_metrics::AccessPoint::ACCESS_POINT_USER_MANAGER, reason_,
       emailAddress_);
-  reauthWebContents_->GetController().LoadURL(url, content::Referrer(),
-                                        ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
-                                        std::string());
+  [self showURL:url];
 }
 
 - (void)closeButtonClicked:(NSButton*)button {
   [self close];
 }
 
 - (void)close {
   constrained_window_->CloseWebContentsModalDialog();
 }
 
@@ skipping 18 matching lines @@
 - (void)dealloc;
 - (id)initWithProfile:(Profile*)profile
          withObserver:(UserManagerMac*)userManagerObserver;
 - (void)showURL:(const GURL&)url;
 - (void)show;
 - (void)close;
 - (BOOL)isVisible;
 - (void)showReauthDialogWithProfile:(Profile*)profile
                               email:(std::string)email
                              reason:(signin_metrics::Reason)reason;
+- (void)displayErrorMessage;
 - (void)closeReauthDialog;
 @end
 
 @implementation UserManagerWindowController
 
 - (id)initWithProfile:(Profile*)profile
          withObserver:(UserManagerMac*)userManagerObserver {
   // Center the window on the screen that currently has focus.
   NSScreen* mainScreen = [NSScreen mainScreen];
   CGFloat screenHeight = [mainScreen frame].size.height;
@@ skipping 95 matching lines @@
 - (void)showReauthDialogWithProfile:(Profile*)profile
                               email:(std::string)email
                              reason:(signin_metrics::Reason)reason {
   reauth_window_controller_.reset([[ReauthDialogWindowController alloc]
       initWithProfile:profile
                 email:email
                reason:reason
           webContents:webContents_.get()]);
 }
 
+- (void)displayErrorMessage {
+  [reauth_window_controller_ showURL:GURL(chrome::kChromeUISigninErrorURL)];
+}
+
 - (void)closeReauthDialog {
   [reauth_window_controller_ close];
 }
 
 @end
 
 
 // static
 void UserManager::Show(
     const base::FilePath& profile_path_to_focus,
@@ skipping 74 matching lines @@
 }
 
 // static
 void UserManager::AddOnUserManagerShownCallbackForTesting(
     const base::Closure& callback) {
   if (!user_manager_shown_callbacks_for_testing_)
     user_manager_shown_callbacks_for_testing_ = new std::vector<base::Closure>;
   user_manager_shown_callbacks_for_testing_->push_back(callback);
 }
 
+// static
+void UserManager::ShowSigninDialog(content::BrowserContext* browser_context,

[tapted, 2016/10/17 05:28:20]

It's a bit sad that these look identical to the implementation in
user_manager_view.cc, except |instance_| is a different global :'(

+                                   const base::FilePath& profile_path) {
+  if (!IsShowing())
+    return;
+  instance_->SetSigninProfilePath(profile_path);
+  ShowReauthDialog(browser_context, std::string(),
+                   signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT);
+}
+
+// static
+void UserManager::DisplayErrorMessage() {
+  DCHECK(instance_);
+  instance_->DisplayErrorMessage();
+}
+
+// static
+base::FilePath UserManager::GetSigninProfilePath() {
+  return instance_->GetSigninProfilePath();
+}
+
 void UserManagerMac::ShowReauthDialog(content::BrowserContext* browser_context,
                                       const std::string& email,
                                       signin_metrics::Reason reason) {
   [window_controller_
       showReauthDialogWithProfile:Profile::FromBrowserContext(browser_context)
                             email:email
                            reason:reason];
 }
 
 void UserManagerMac::CloseReauthDialog() {
@@ skipping 26 matching lines @@
   ProfileMetrics::LogTimeToOpenUserManager(
       base::Time::Now() - user_manager_started_showing_);
   user_manager_started_showing_ = base::Time();
 }
 
 void UserManagerMac::WindowWasClosed() {
   CloseReauthDialog();
   instance_ = NULL;
   delete this;
 }
+
+void UserManagerMac::DisplayErrorMessage() {
+  [window_controller_ displayErrorMessage];
+}
+
+void UserManagerMac::SetSigninProfilePath(const base::FilePath& profile_path) {
+  signin_profile_path_ = profile_path;
+}
+
+base::FilePath UserManagerMac::GetSigninProfilePath() {
+  return signin_profile_path_;
+}