Remove references to IsNewAvatarMenu since the flag was removed.

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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 57 matching lines @@
 #else
   chrome::ScopedTabbedBrowserDisplayer displayer(
       profile_, chrome::GetActiveDesktop());
   chrome::ShowBrowserSignin(
       displayer.browser(), signin_metrics::SOURCE_APP_LAUNCHER);
 #endif
 }
 
 void LoginUIService::DisplayLoginResult(Browser* browser,
                                         const base::string16& message) {
+#if defined(OS_CHROMEOS)
+  // ChromeOS doesn't have the avatar bubble so it never calls this function.
+  NOTREACHED();
+#endif
   last_login_result_ = message;
-  if (switches::IsNewAvatarMenu()) {
-    browser->window()->ShowAvatarBubbleFromAvatarButton(
-        message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN :
-                          BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR,
-        signin::ManageAccountsParams());
-  } else {
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-    browser->window()->ShowOneClickSigninBubble(
-        BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
-        base::string16(), /* no SAML email */
-        message,
-        // This callback is never invoked.
-        // TODO(rogerta): Separate out the bubble API so we don't have to pass
-        // ignored |email| and |callback| params.
-        BrowserWindow::StartSyncCallback());
-#endif
-  }
+  browser->window()->ShowAvatarBubbleFromAvatarButton(
+      message.empty() ? BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN :
+                        BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR,
+      signin::ManageAccountsParams());
 }
 
 const base::string16& LoginUIService::GetLastLoginResult() {
   return last_login_result_;
 }