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

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

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert FRAME_AVATAR_BUTTON changes. Created 5 years, 2 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.define('options', function() { 5 cr.define('options', function() {
6 var Page = cr.ui.pageManager.Page; 6 var Page = cr.ui.pageManager.Page;
7 var PageManager = cr.ui.pageManager.PageManager; 7 var PageManager = cr.ui.pageManager.PageManager;
8 var ArrayDataModel = cr.ui.ArrayDataModel; 8 var ArrayDataModel = cr.ui.ArrayDataModel;
9 9
10 /** 10 /**
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 }; 88 };
89 89
90 $('create-profile-supervised-signed-in-learn-more-link').onclick = 90 $('create-profile-supervised-signed-in-learn-more-link').onclick =
91 function(event) { 91 function(event) {
92 PageManager.showPageByName('supervisedUserLearnMore'); 92 PageManager.showPageByName('supervisedUserLearnMore');
93 return false; 93 return false;
94 }; 94 };
95 95
96 $('create-profile-supervised-sign-in-link').onclick = 96 $('create-profile-supervised-sign-in-link').onclick =
97 function(event) { 97 function(event) {
98 // Without the new avatar menu, the signin process will open an overlay 98 // TODO(pamg): Move the sync-setup overlay to a higher layer so this
99 // to configure sync, which would replace this overlay. It's smoother to 99 // one can stay open under it, after making sure that doesn't break
100 // close this one now. 100 // anything else.
101 // With the new avatar menu enabled, a sign-in flow in the avatar menu 101 PageManager.closeOverlay();
102 // is triggered instead, which does not open any overlays, so there's no
103 // need to close this one.
104 if (!loadTimeData.getBoolean('newAvatarMenuEnabled')) {
105 // TODO(pamg): Move the sync-setup overlay to a higher layer so this
106 // one can stay open under it, after making sure that doesn't break
107 // anything else.
108 PageManager.closeOverlay();
109 }
110 SyncSetupOverlay.startSignIn(); 102 SyncSetupOverlay.startSignIn();
111 }; 103 };
112 104
113 $('create-profile-supervised-sign-in-again-link').onclick = 105 $('create-profile-supervised-sign-in-again-link').onclick =
114 function(event) { 106 function(event) {
115 if (!loadTimeData.getBoolean('newAvatarMenuEnabled')) 107 PageManager.closeOverlay();
116 PageManager.closeOverlay();
Evan Stade 2015/09/25 22:49:10 shouldn't this line be deleted too
anthonyvd 2015/09/29 20:23:15 You're right, and same thing for the one at line 1
117 SyncSetupOverlay.showSetupUI(); 108 SyncSetupOverlay.showSetupUI();
118 }; 109 };
119 110
120 $('import-existing-supervised-user-link').onclick = function(event) { 111 $('import-existing-supervised-user-link').onclick = function(event) {
121 // Hide the import button to trigger a cursor update. The import button 112 // Hide the import button to trigger a cursor update. The import button
122 // is shown again when the import overlay loads. TODO(akuegel): Remove 113 // is shown again when the import overlay loads. TODO(akuegel): Remove
123 // this temporary fix when crbug/246304 is resolved. 114 // this temporary fix when crbug/246304 is resolved.
124 $('import-existing-supervised-user-link').hidden = true; 115 $('import-existing-supervised-user-link').hidden = true;
125 PageManager.showPageByName('supervisedUserImport'); 116 PageManager.showPageByName('supervisedUserImport');
126 }; 117 };
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 'updateSignedInStatus', 866 'updateSignedInStatus',
876 'updateSupervisedUsersAllowed', 867 'updateSupervisedUsersAllowed',
877 ]); 868 ]);
878 869
879 // Export 870 // Export
880 return { 871 return {
881 ManageProfileOverlay: ManageProfileOverlay, 872 ManageProfileOverlay: ManageProfileOverlay,
882 CreateProfileOverlay: CreateProfileOverlay, 873 CreateProfileOverlay: CreateProfileOverlay,
883 }; 874 };
884 }); 875 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698