chrome/browser/app_controller_mac.mm - Issue 12077030: Allow signin to continue even if sync is disabled by policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix windows sync integration test failure Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/app_controller_mac.mm

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm

index f64a380046dd4b42af40a51d0cb20fe4b471b094..5d8acbc036003b056b764f47e780538b813809f6 100644

--- a/chrome/browser/app_controller_mac.mm

+++ b/chrome/browser/app_controller_mac.mm

@@ -778,8 +778,7 @@ void RecordLastRunAppBundlePath() {

<< "NULL lastProfile detected -- not doing anything";

break;

}

- enable = lastProfile->IsSyncAccessible() &&

- ![self keyWindowIsModal];

+ enable = ![self keyWindowIsModal];

[BrowserWindowController updateSigninItem:item

shouldShow:enable

currentProfile:lastProfile];

@@ -918,7 +917,7 @@ void RecordLastRunAppBundlePath() {

break;

case IDC_SHOW_SYNC_SETUP:

if (Browser* browser = ActivateBrowser(lastProfile))

- chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_MENU);

+ chrome::ShowBrowserSignin(browser, SyncPromoUI::SOURCE_MENU);

else

chrome::OpenSyncSetupWindow(lastProfile, SyncPromoUI::SOURCE_MENU);

break;