Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 352 matching lines @@
         original_profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
     browser = displayer->browser();
   }
 
   signin_metrics::LogSigninSource(source);
 
   // Since the app launcher is a separate application, it might steal focus
   // away from Chrome, and accidentally close the avatar bubble. The same will
   // happen if we had to switch browser windows to show the sign in page. In
   // this case, fallback to the full-tab signin page.
-  if (switches::IsNewAvatarMenu() &&
-      source != signin_metrics::SOURCE_APP_LAUNCHER && !switched_browser) {
+  bool should_show_in_avatar_bubble =

[Peter Kasting, 2015/09/25 23:42:52]

Nit: |show_avatar_bubble| is shorter and seems just as clear.

[anthonyvd, 2015/09/29 20:23:15]

Done.

+      source != signin_metrics::SOURCE_APP_LAUNCHER && !switched_browser;
+#if defined(OS_CHROMEOS)
+  // ChromeOS doesn't have the Avatar Bubble.

[Peter Kasting, 2015/09/25 23:42:52]

Nit: Don't capitalize Avatar Bubble

[anthonyvd, 2015/09/29 20:23:15]

Done.

+  should_show_in_avatar_bubble = false;
+#endif
+
+  if (should_show_in_avatar_bubble) {
     browser->window()->ShowAvatarBubbleFromAvatarButton(
         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
         signin::ManageAccountsParams());
   } else {
     NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
     DCHECK_GT(browser->tab_strip_model()->count(), 0);
   }
 }
 
 void ShowBrowserSigninOrSettings(
     Browser* browser,
     signin_metrics::Source source) {
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, source);
 }
 #endif
 
 }  // namespace chrome