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

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

Issue 11788020: Make CrOS and Chromium settings UI string the same. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL }, 212 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL },
213 { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS }, 213 { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS },
214 { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP }, 214 { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP },
215 { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 215 { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
216 { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB }, 216 { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
217 { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL }, 217 { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
218 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE }, 218 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE },
219 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON }, 219 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
220 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 220 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
221 { "languageAndSpellCheckSettingsButton", 221 { "languageAndSpellCheckSettingsButton",
222 #if defined(OS_CHROMEOS)
223 IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE },
224 #else
225 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS }, 222 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
226 #endif
227 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 223 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
228 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 224 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
229 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 225 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
230 { "networkPredictionEnabledDescription", 226 { "networkPredictionEnabledDescription",
231 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 227 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
232 { "passwordsAndAutofillGroupName", 228 { "passwordsAndAutofillGroupName",
233 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 229 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
234 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 230 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
235 { "passwordGenerationEnabledDescription", 231 { "passwordGenerationEnabledDescription",
236 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, 232 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL },
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1396 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 1392 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
1397 } 1393 }
1398 StringValue label(label_str); 1394 StringValue label(label_str);
1399 1395
1400 web_ui()->CallJavascriptFunction( 1396 web_ui()->CallJavascriptFunction(
1401 "BrowserOptions.setupProxySettingsSection", disabled, label); 1397 "BrowserOptions.setupProxySettingsSection", disabled, label);
1402 #endif // !defined(OS_CHROMEOS) 1398 #endif // !defined(OS_CHROMEOS)
1403 } 1399 }
1404 1400
1405 } // namespace options 1401 } // namespace options
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698