Index: chrome/browser/ui/chrome_pages.cc |
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc |
index 0864296f13c7b162aabe140732dd76cecfdb207f..9255140465d05bc515f18c0bde5b6497c8354931 100644 |
--- a/chrome/browser/ui/chrome_pages.cc |
+++ b/chrome/browser/ui/chrome_pages.cc |
@@ -9,6 +9,7 @@ |
#include "base/stringprintf.h" |
#include "chrome/browser/download/download_shelf.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/signin/signin_manager.h" |
#include "chrome/browser/sync/profile_sync_service.h" |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/browser/ui/browser.h" |
@@ -181,12 +182,13 @@ void ShowSearchEngineSettings(Browser* browser) { |
ShowSettingsSubPage(browser, kSearchEnginesSubPage); |
} |
-void ShowSyncSetup(Browser* browser, SyncPromoUI::Source source) { |
+void ShowBrowserSignin(Browser* browser, SyncPromoUI::Source source) { |
Profile* original_profile = browser->profile()->GetOriginalProfile(); |
ProfileSyncService* service = |
ProfileSyncServiceFactory::GetInstance()->GetForProfile( |
original_profile); |
- if (service->HasSyncSetupCompleted()) { |
+ // If we're signed in, just show settings. |
+ if (!service->signin()->GetAuthenticatedUsername().empty()) { |
ShowSettings(browser); |
} else { |
// If the browser's profile is an incognito profile, make sure to use |