Revert of Use the modal view when signing in from chrome.identity extension API.

chrome/browser/ui/webui/signin/login_ui_service.cc

 // Copyright (c) 2012 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/webui/signin/login_ui_service.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
-#include "chrome/browser/ui/profile_chooser_constants.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/common/profile_management_switches.h"
 
 LoginUIService::LoginUIService(Profile* profile)
 #if !defined(OS_CHROMEOS)
     : profile_(profile)
@@ skipping 28 matching lines @@
     SyncConfirmationUIClosedResult result) {
   for (Observer& observer : observer_list_)
     observer.OnSyncConfirmationUIClosed(result);
 }
 
 void LoginUIService::ShowLoginPopup() {
 #if defined(OS_CHROMEOS)
   NOTREACHED();
 #else
   chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
-  profiles::BubbleViewMode signin_mode = profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
-  if (SigninViewController::ShouldShowModalSigninForMode(signin_mode)) {
-    displayer.browser()->ShowModalSigninWindow(signin_mode,
-        signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS);
-  } else {
-    chrome::ShowBrowserSignin(
-        displayer.browser(),
-        signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS);
-  }
+  chrome::ShowBrowserSignin(
+      displayer.browser(),
+      signin_metrics::AccessPoint::ACCESS_POINT_EXTENSIONS);
 #endif
 }
 
 void LoginUIService::DisplayLoginResult(Browser* browser,
                                         const base::string16& error_message,
                                         const base::string16& email) {
 #if defined(OS_CHROMEOS)
   // ChromeOS doesn't have the avatar bubble so it never calls this function.
   NOTREACHED();
 #endif
@@ skipping 13 matching lines @@
   }
 }
 
 const base::string16& LoginUIService::GetLastLoginResult() const {
   return last_login_result_;
 }
 
 const base::string16& LoginUIService::GetLastLoginErrorEmail() const {
   return last_login_error_email_;
 }