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

Unified Diff: chrome/browser/resources/options2/manage_profile_overlay.js

Issue 10834142: [options2] Fix issue when deleting a user and pressing back. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: let's try again Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/manage_profile_overlay.js
diff --git a/chrome/browser/resources/options2/manage_profile_overlay.js b/chrome/browser/resources/options2/manage_profile_overlay.js
index f8cdda6c8b9b9046138c4ff66bdea54c96382021..46c41090b2a8c76729585ea5cf84a5a60d1c8a68 100644
--- a/chrome/browser/resources/options2/manage_profile_overlay.js
+++ b/chrome/browser/resources/options2/manage_profile_overlay.js
@@ -85,9 +85,7 @@ cr.define('options', function() {
didShowPage: function() {
chrome.send('requestDefaultProfileIcons');
- // Use the hash to specify the profile index. Note: the actual index
- // is ignored. Only the current profile may be edited.
- if (window.location.hash.length > 1)
+ if (window.location.pathname == '/manageProfile')
ManageProfileOverlay.getInstance().prepareForManageDialog_();
$('manage-profile-name').focus();
@@ -238,6 +236,9 @@ cr.define('options', function() {
* @private
*/
prepareForManageDialog_: function() {
+ if (cr.isChromeOS)
Dan Beam 2012/08/07 21:31:31 so apparently chromeos uses /accounts and hides th
+ return;
+
var profileInfo = BrowserOptions.getCurrentProfile();
ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
$('manage-profile-overlay-create').hidden = true;
@@ -290,7 +291,7 @@ cr.define('options', function() {
loadTimeData.getStringF('createProfileInstructions');
ManageProfileOverlay.getInstance().hideErrorBubble_('create');
- OptionsPage.navigateToPage('manageProfile');
+ OptionsPage.showPageByName('manageProfile', false);
},
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698