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

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

Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes chromeos_rel test failure and includes a rebase Created 6 years, 7 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 OptionsPage = options.OptionsPage; 6 var OptionsPage = options.OptionsPage;
7 var ArrayDataModel = cr.ui.ArrayDataModel; 7 var ArrayDataModel = cr.ui.ArrayDataModel;
8 8
9 /** 9 /**
10 * ManageProfileOverlay class 10 * ManageProfileOverlay class
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 }, 547 },
548 548
549 /** 549 /**
550 * Display the "Disconnect Managed Profile" dialog. 550 * Display the "Disconnect Managed Profile" dialog.
551 * @private 551 * @private
552 */ 552 */
553 showDisconnectManagedProfileDialog_: function() { 553 showDisconnectManagedProfileDialog_: function() {
554 $('manage-profile-overlay-create').hidden = true; 554 $('manage-profile-overlay-create').hidden = true;
555 $('manage-profile-overlay-manage').hidden = true; 555 $('manage-profile-overlay-manage').hidden = true;
556 $('manage-profile-overlay-delete').hidden = true; 556 $('manage-profile-overlay-delete').hidden = true;
557 $('disconnect-managed-profile-domain-information').innerHTML =
558 loadTimeData.getString('disconnectManagedProfileDomainInformation');
559 $('disconnect-managed-profile-text').innerHTML =
560 loadTimeData.getString('disconnectManagedProfileText');
557 $('manage-profile-overlay-disconnect-managed').hidden = false; 561 $('manage-profile-overlay-disconnect-managed').hidden = false;
558 562
559 // Because this dialog isn't useful when refreshing or as part of the 563 // Because this dialog isn't useful when refreshing or as part of the
560 // history, don't create a history entry for it when showing. 564 // history, don't create a history entry for it when showing.
561 OptionsPage.showPageByName('manageProfile', false); 565 OptionsPage.showPageByName('manageProfile', false);
562 }, 566 },
563 567
564 /** 568 /**
565 * Display the "Create Profile" dialog. 569 * Display the "Create Profile" dialog.
566 * @private 570 * @private
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 return instance[name + '_'].apply(instance, arguments); 851 return instance[name + '_'].apply(instance, arguments);
848 }; 852 };
849 }); 853 });
850 854
851 // Export 855 // Export
852 return { 856 return {
853 ManageProfileOverlay: ManageProfileOverlay, 857 ManageProfileOverlay: ManageProfileOverlay,
854 CreateProfileOverlay: CreateProfileOverlay, 858 CreateProfileOverlay: CreateProfileOverlay,
855 }; 859 };
856 }); 860 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/manage_profile_overlay.html ('k') | chrome/browser/ui/webui/options/manage_profile_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698