Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: chrome/browser/resources/options/browser_options.js

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: Fix double quote Created 3 years, 6 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** 7 /**
8 * @typedef {{actionLinkText: (string|undefined), 8 * @typedef {{actionLinkText: (string|undefined),
9 * accountInfo: (string|undefined), 9 * accountInfo: (string|undefined),
10 * childUser: (boolean|undefined), 10 * childUser: (boolean|undefined),
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 chrome.send('SyncSetupStopSyncing', [false /* deleteProfile */]); 1236 chrome.send('SyncSetupStopSyncing', [false /* deleteProfile */]);
1237 SyncSetupOverlay.startSignIn(false /* creatingSupervisedUser */); 1237 SyncSetupOverlay.startSignIn(false /* creatingSupervisedUser */);
1238 } else { 1238 } else {
1239 chrome.send('showDisconnectManagedProfileDialog'); 1239 chrome.send('showDisconnectManagedProfileDialog');
1240 } 1240 }
1241 // </if> 1241 // </if>
1242 break; 1242 break;
1243 case 'upgradeClient': 1243 case 'upgradeClient':
1244 PageManager.showPageByName('help'); 1244 PageManager.showPageByName('help');
1245 break; 1245 break;
1246 case 'confirmSyncSettings':
1246 default: 1247 default:
1247 SyncSetupOverlay.showSetupUI(); 1248 SyncSetupOverlay.showSetupUI();
1248 } 1249 }
1249 }; 1250 };
1250 1251
1251 if (syncData.hasError) 1252 if (syncData.hasError)
1252 $('sync-status').classList.add('sync-error'); 1253 $('sync-status').classList.add('sync-error');
1253 else 1254 else
1254 $('sync-status').classList.remove('sync-error'); 1255 $('sync-status').classList.remove('sync-error');
1255 1256
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
2482 2483
2483 settings.hidden = !isVisible; 2484 settings.hidden = !isVisible;
2484 }; 2485 };
2485 } 2486 }
2486 2487
2487 // Export 2488 // Export
2488 return { 2489 return {
2489 BrowserOptions: BrowserOptions 2490 BrowserOptions: BrowserOptions
2490 }; 2491 };
2491 }); 2492 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698