Commit f825aacd authored by Thomas Tangl's avatar Thomas Tangl Committed by Commit Bot

[Dice] Change target of user menu profile card to settings/people

When the user is signed into Chrome and clicks the
profile card in the user menu, they are now directed
to chrome://settings/people.

Bug: 852092
Change-Id: I89c770869232956ae8fb00a61cad8ebb6375532f
Reviewed-on: https://chromium-review.googlesource.com/1102422Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567615}
parent 9b2c8f90
...@@ -67,7 +67,7 @@ const char* const kChromeSettingsSubPages[] = { ...@@ -67,7 +67,7 @@ const char* const kChromeSettingsSubPages[] = {
chrome::kStylusSubPage, chrome::kStylusSubPage,
#else #else
chrome::kCreateProfileSubPage, chrome::kImportDataSubPage, chrome::kCreateProfileSubPage, chrome::kImportDataSubPage,
chrome::kManageProfileSubPage, chrome::kManageProfileSubPage, chrome::kPeopleSubPage,
#endif #endif
}; };
#endif // !defined(OS_ANDROID) #endif // !defined(OS_ANDROID)
......
...@@ -669,12 +669,7 @@ void ProfileChooserView::ButtonPressed(views::Button* sender, ...@@ -669,12 +669,7 @@ void ProfileChooserView::ButtonPressed(views::Button* sender,
if (dice_enabled_ && if (dice_enabled_ &&
SigninManagerFactory::GetForProfile(browser_->profile()) SigninManagerFactory::GetForProfile(browser_->profile())
->IsAuthenticated()) { ->IsAuthenticated()) {
if (!browser_->profile()->IsSyncAllowed() || chrome::ShowSettingsSubPage(browser_, chrome::kPeopleSubPage);
HasAuthError(browser_->profile())) {
chrome::ShowSettings(browser_);
} else {
chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
}
} else { } else {
// Open settings to edit profile name and image. The profile doesn't need // Open settings to edit profile name and image. The profile doesn't need
// to be authenticated to open this. // to be authenticated to open this.
......
...@@ -292,6 +292,7 @@ const char kStylusSubPage[] = "stylus"; ...@@ -292,6 +292,7 @@ const char kStylusSubPage[] = "stylus";
#else #else
const char kCreateProfileSubPage[] = "createProfile"; const char kCreateProfileSubPage[] = "createProfile";
const char kManageProfileSubPage[] = "manageProfile"; const char kManageProfileSubPage[] = "manageProfile";
const char kPeopleSubPage[] = "people";
#endif // defined(OS_CHROMEOS) #endif // defined(OS_CHROMEOS)
#if defined(OS_WIN) #if defined(OS_WIN)
const char kCleanupSubPage[] = "cleanup"; const char kCleanupSubPage[] = "cleanup";
......
...@@ -263,6 +263,7 @@ extern const char kImportDataSubPage[]; ...@@ -263,6 +263,7 @@ extern const char kImportDataSubPage[];
extern const char kLanguageOptionsSubPage[]; extern const char kLanguageOptionsSubPage[];
extern const char kManageProfileSubPage[]; extern const char kManageProfileSubPage[];
extern const char kPasswordManagerSubPage[]; extern const char kPasswordManagerSubPage[];
extern const char kPeopleSubPage[];
extern const char kPrintingSettingsSubPage[]; extern const char kPrintingSettingsSubPage[];
extern const char kResetProfileSettingsSubPage[]; extern const char kResetProfileSettingsSubPage[];
extern const char kSearchEnginesSubPage[]; extern const char kSearchEnginesSubPage[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment