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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2787053002: MD Settings: Change some instances of "Not valid" to "Not a valid web address". (Closed)
Patch Set: nit. Created 3 years, 8 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
« no previous file with comments | « chrome/browser/resources/settings/site_settings/edit_exception_dialog.html ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 {"learnMore", IDS_LEARN_MORE}, 92 {"learnMore", IDS_LEARN_MORE},
93 {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL}, 93 {"menuButtonLabel", IDS_SETTINGS_MENU_BUTTON_LABEL},
94 {"moreActions", IDS_SETTINGS_MORE_ACTIONS}, 94 {"moreActions", IDS_SETTINGS_MORE_ACTIONS},
95 {"ok", IDS_OK}, 95 {"ok", IDS_OK},
96 {"restart", IDS_SETTINGS_RESTART}, 96 {"restart", IDS_SETTINGS_RESTART},
97 {"save", IDS_SAVE}, 97 {"save", IDS_SAVE},
98 {"settings", IDS_SETTINGS_SETTINGS}, 98 {"settings", IDS_SETTINGS_SETTINGS},
99 {"toggleOn", IDS_SETTINGS_TOGGLE_ON}, 99 {"toggleOn", IDS_SETTINGS_TOGGLE_ON},
100 {"toggleOff", IDS_SETTINGS_TOGGLE_OFF}, 100 {"toggleOff", IDS_SETTINGS_TOGGLE_OFF},
101 {"notValid", IDS_SETTINGS_NOT_VALID}, 101 {"notValid", IDS_SETTINGS_NOT_VALID},
102 {"notValidWebAddress", IDS_SETTINGS_NOT_VALID_WEB_ADDRESS},
102 }; 103 };
103 AddLocalizedStringsBulk(html_source, localized_strings, 104 AddLocalizedStringsBulk(html_source, localized_strings,
104 arraysize(localized_strings)); 105 arraysize(localized_strings));
105 106
106 html_source->AddBoolean( 107 html_source->AddBoolean(
107 "isGuest", 108 "isGuest",
108 #if defined(OS_CHROMEOS) 109 #if defined(OS_CHROMEOS)
109 user_manager::UserManager::Get()->IsLoggedInAsGuest() || 110 user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
110 user_manager::UserManager::Get()->IsLoggedInAsPublicAccount()); 111 user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());
111 #else 112 #else
(...skipping 1910 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 2023
2023 #if defined(OS_CHROMEOS) 2024 #if defined(OS_CHROMEOS)
2024 chromeos::network_element::AddLocalizedStrings(html_source); 2025 chromeos::network_element::AddLocalizedStrings(html_source);
2025 #endif 2026 #endif
2026 policy_indicator::AddLocalizedStrings(html_source); 2027 policy_indicator::AddLocalizedStrings(html_source);
2027 2028
2028 html_source->SetJsonPath(kLocalizedStringsFile); 2029 html_source->SetJsonPath(kLocalizedStringsFile);
2029 } 2030 }
2030 2031
2031 } // namespace settings 2032 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/site_settings/edit_exception_dialog.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698