Reland r242290, r241609, r242134.

chrome/browser/ui/views/profile_chooser_view.cc

Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index 6c308a15f6cd0c5e56944deb53a12a056f2fe330..f6a882297d0390a8565ea630764a20dc4b1231e3 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/views/user_manager_view.h"
-#include "chrome/common/profile_management_switches.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -569,12 +568,7 @@ void ProfileChooserView::LinkClicked(views::Link* sender, int event_flags) {
     profiles::LockProfile(browser_->profile());
   } else {
     DCHECK(sender == signin_current_profile_link_);
-    if (switches::IsEnableInlineSignin()) {
-      ShowView(GAIA_SIGNIN_VIEW, avatar_menu_.get());
-    } else {
-      GURL page = signin::GetPromoURL(signin::SOURCE_MENU, false);
-      chrome::ShowSingletonTab(browser_, page);
-    }
+    ShowView(GAIA_SIGNIN_VIEW, avatar_menu_.get());
   }
 }