diff options
| author | ncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 18:29:41 +0000 |
|---|---|---|
| committer | ncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 18:29:41 +0000 |
| commit | 82c40067e90f3953f3d11132692eec745119839d (patch) | |
| tree | f582030dd677c431d8260bd4e3bb9a6c94e8d7aa | |
| parent | cafc2e38c2fd85eaf0518927dd437f316e022be7 (diff) | |
| download | chromium_src-82c40067e90f3953f3d11132692eec745119839d.zip chromium_src-82c40067e90f3953f3d11132692eec745119839d.tar.gz chromium_src-82c40067e90f3953f3d11132692eec745119839d.tar.bz2 | |
Options: Showing tooltip when "Edit" button in multi-profiles list is grayed out.
BUG=125272
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10532191
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142760 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/options2/browser_options.js | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options2/browser_options_handler2.cc | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 86cfb6c..3608bb2 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9387,6 +9387,9 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" <message name="IDS_GOOGLE_CLOUD_PRINT" desc="The name of the Google Cloud Print product."> Google Cloud Print </message> + <message name="IDS_OPTIONS_CURRENT_USER_ONLY" desc="In the multi profiles user list, the tooltip text noticing that only the current user can modify these settings."> + You can only edit settings for the current user. Switch to this user to edit settings for it. + </message> <if expr="pp_ifdef('android')"> <message name="IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_DISABLED_LABEL" desc="Mobile: The label of the cloud print setup button when it hasn't been set up yet."> <ph name="CLOUD_PRINT_NAME">$1<ex>Google Cloud Print</ex></ph> lets you access this mobile device's printers from anywhere. Click to enable. diff --git a/chrome/browser/resources/options2/browser_options.js b/chrome/browser/resources/options2/browser_options.js index f8a0b2b..9495aae 100644 --- a/chrome/browser/resources/options2/browser_options.js +++ b/chrome/browser/resources/options2/browser_options.js @@ -963,6 +963,10 @@ cr.define('options', function() { var hasSingleProfile = profilesList.dataModel.length == 1; $('profiles-manage').disabled = !hasSelection || !selectedProfile.isCurrentProfile; + if (hasSelection && !selectedProfile.isCurrentProfile) + $('profiles-manage').title = loadTimeData.getString('currentUserOnly'); + else + $('profiles-manage').title = ''; $('profiles-delete').disabled = !hasSelection && !hasSingleProfile; var importData = $('import-data'); if (importData) { diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc index 7831a74..0ef6855 100644 --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc @@ -150,6 +150,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) { static OptionsStringResource resources[] = { { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT }, + { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY }, { "advancedSectionTitleContent", IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, { "advancedSectionTitleLanguages", |