diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 21:29:43 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 21:29:43 +0000 |
commit | ade3fd71803207c3f12d5f5e64b307d2a0d6a8bc (patch) | |
tree | 0f773128d295092f637994924ef0fa17f6ea8336 | |
parent | 886260715c2a415bd3b7d3217b69762497cccec3 (diff) | |
download | chromium_src-ade3fd71803207c3f12d5f5e64b307d2a0d6a8bc.zip chromium_src-ade3fd71803207c3f12d5f5e64b307d2a0d6a8bc.tar.gz chromium_src-ade3fd71803207c3f12d5f5e64b307d2a0d6a8bc.tar.bz2 |
Settings: Fix the title of the 'manage profile' overlay.
BUG=114616
TEST=none
R=csilv
Review URL: https://chromiumcodereview.appspot.com/9416034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122357 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 7 insertions, 12 deletions
diff --git a/chrome/browser/resources/options2/manage_profile_overlay.html b/chrome/browser/resources/options2/manage_profile_overlay.html index afc4801..0bb9239 100644 --- a/chrome/browser/resources/options2/manage_profile_overlay.html +++ b/chrome/browser/resources/options2/manage_profile_overlay.html @@ -1,7 +1,7 @@ <div id="manage-profile-overlay" class="page" hidden> <!-- Dialog for managing profiles. --> <div id="manage-profile-overlay-manage" hidden> - <h1 i18n-content="manageProfilesTitle"></h1> + <h1 i18n-content="manageProfile"></h1> <div id="manage-profile-content" class="content-area"> <div id="manage-profile-name-div"> <span id="manage-profile-name-label" diff --git a/chrome/browser/resources/options2/manage_profile_overlay.js b/chrome/browser/resources/options2/manage_profile_overlay.js index 21afb6e..c11b576 100644 --- a/chrome/browser/resources/options2/manage_profile_overlay.js +++ b/chrome/browser/resources/options2/manage_profile_overlay.js @@ -15,9 +15,7 @@ cr.define('options', function() { * @class */ function ManageProfileOverlay() { - OptionsPage.call(this, - 'manageProfile', - templateData.manageProfileOverlayTabTitle, + OptionsPage.call(this, 'manageProfile', templateData.manageProfileTabTitle, 'manage-profile-overlay'); }; @@ -219,9 +217,7 @@ cr.define('options', function() { $('manage-profile-overlay-delete').hidden = true; ManageProfileOverlay.getInstance().hideErrorBubble_(); - // Intentionally don't show the URL in the location bar as we don't want - // people trying to navigate here by hand. - OptionsPage.showPageByName('manageProfile', false); + OptionsPage.navigateToPage('manageProfile'); }, /** @@ -238,9 +234,7 @@ cr.define('options', function() { $('delete-profile-message').style.backgroundImage = 'url("' + profileInfo.iconURL + '")'; - // Intentionally don't show the URL in the location bar as we don't want - // people trying to navigate here by hand. - OptionsPage.showPageByName('manageProfile', false); + OptionsPage.navigateToPage('manageProfile'); }, }; diff --git a/chrome/browser/ui/webui/options2/manage_profile_handler2.cc b/chrome/browser/ui/webui/options2/manage_profile_handler2.cc index 6a886d4..d371915 100644 --- a/chrome/browser/ui/webui/options2/manage_profile_handler2.cc +++ b/chrome/browser/ui/webui/options2/manage_profile_handler2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,7 +35,6 @@ void ManageProfileHandler::GetLocalizedValues( DCHECK(localized_strings); static OptionsStringResource resources[] = { - { "manageProfilesTitle", IDS_PROFILES_MANAGE_TITLE }, { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL }, { "manageProfilesDuplicateNameError", IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR }, @@ -46,6 +45,8 @@ void ManageProfileHandler::GetLocalizedValues( }; RegisterStrings(localized_strings, resources, arraysize(resources)); + RegisterTitle(localized_strings, "manageProfile", + IDS_PROFILES_MANAGE_TITLE); } void ManageProfileHandler::Initialize() { |