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

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

Issue 1608103002: Settings Rewrite: Fix Opening Sync User login (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/resources/options/manage_profile_overlay.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 * childUser: (boolean|undefined), 9 * childUser: (boolean|undefined),
10 * hasError: (boolean|undefined), 10 * hasError: (boolean|undefined),
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 $('start-stop-sync').onclick = function(event) { 194 $('start-stop-sync').onclick = function(event) {
195 if (self.signedIn_) { 195 if (self.signedIn_) {
196 if (self.signoutAllowed_) 196 if (self.signoutAllowed_)
197 SyncSetupOverlay.showStopSyncingUI(); 197 SyncSetupOverlay.showStopSyncingUI();
198 else 198 else
199 chrome.send('showDisconnectManagedProfileDialog'); 199 chrome.send('showDisconnectManagedProfileDialog');
200 } else if (cr.isChromeOS) { 200 } else if (cr.isChromeOS) {
201 SyncSetupOverlay.showSetupUI(); 201 SyncSetupOverlay.showSetupUI();
202 } else { 202 } else {
203 SyncSetupOverlay.startSignIn('access-point-settings'); 203 SyncSetupOverlay.startSignIn(false /* creatingSupervisedUser */);
204 } 204 }
205 }; 205 };
206 $('customize-sync').onclick = function(event) { 206 $('customize-sync').onclick = function(event) {
207 SyncSetupOverlay.showSetupUI(); 207 SyncSetupOverlay.showSetupUI();
208 }; 208 };
209 209
210 // Internet connection section (ChromeOS only). 210 // Internet connection section (ChromeOS only).
211 if (cr.isChromeOS) { 211 if (cr.isChromeOS) {
212 options.network.NetworkList.decorate($('network-list')); 212 options.network.NetworkList.decorate($('network-list'));
213 // Show that the network settings are shared if this is a secondary user 213 // Show that the network settings are shared if this is a secondary user
(...skipping 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after
2326 if (section) 2326 if (section)
2327 section.hidden = true; 2327 section.hidden = true;
2328 }; 2328 };
2329 } 2329 }
2330 2330
2331 // Export 2331 // Export
2332 return { 2332 return {
2333 BrowserOptions: BrowserOptions 2333 BrowserOptions: BrowserOptions
2334 }; 2334 };
2335 }); 2335 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/manage_profile_overlay.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698