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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 11473009: Unified settings button name for OSX/Win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 214 { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
215 { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB }, 215 { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
216 { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL }, 216 { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
217 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE }, 217 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE },
218 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON }, 218 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
219 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 219 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
220 { "languageAndSpellCheckSettingsButton", 220 { "languageAndSpellCheckSettingsButton",
221 #if defined(OS_CHROMEOS) 221 #if defined(OS_CHROMEOS)
222 IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE }, 222 IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE },
223 #else 223 #else
224 IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON }, 224 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
225 #endif 225 #endif
226 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 226 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
227 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 227 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
228 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 228 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
229 { "networkPredictionEnabledDescription", 229 { "networkPredictionEnabledDescription",
230 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 230 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
231 { "passwordsAndAutofillGroupName", 231 { "passwordsAndAutofillGroupName",
232 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 232 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
233 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 233 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
234 { "passwordGenerationEnabledDescription", 234 { "passwordGenerationEnabledDescription",
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 1421 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
1422 } 1422 }
1423 StringValue label(label_str); 1423 StringValue label(label_str);
1424 1424
1425 web_ui()->CallJavascriptFunction( 1425 web_ui()->CallJavascriptFunction(
1426 "BrowserOptions.setupProxySettingsSection", disabled, label); 1426 "BrowserOptions.setupProxySettingsSection", disabled, label);
1427 #endif // !defined(OS_CHROMEOS) 1427 #endif // !defined(OS_CHROMEOS)
1428 } 1428 }
1429 1429
1430 } // namespace options 1430 } // namespace options
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698