| Index: chrome/browser/ui/chrome_pages.cc
|
| diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
|
| index ccfbac461fb8e645b47a66211927e0dd1b331015..ededffbc529b476a790b23cc87b821cbf7ca575a 100644
|
| --- a/chrome/browser/ui/chrome_pages.cc
|
| +++ b/chrome/browser/ui/chrome_pages.cc
|
| @@ -20,10 +20,12 @@
|
| #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
|
| #include "chrome/browser/ui/settings_window_manager.h"
|
| #include "chrome/browser/ui/singleton_tabs.h"
|
| +#include "chrome/browser/ui/sync/one_click_signin_helper.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/webui/options/content_settings_handler.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "components/signin/core/common/profile_management_switches.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "extensions/common/constants.h"
|
| @@ -347,8 +349,16 @@ void ShowBrowserSignin(Browser* browser, signin::Source source) {
|
| browser = displayer->browser();
|
| }
|
|
|
| - NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
|
| - DCHECK_GT(browser->tab_strip_model()->count(), 0);
|
| + OneClickSigninHelper::LogHistogramSourceValue(source);
|
| +
|
| + if (switches::IsNewAvatarMenu()) {
|
| + 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);
|
| + }
|
| }
|
| }
|
| #endif
|
|
|