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

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

Issue 2342473003: [MD settings] site details url below Site details subpage title (Closed)
Patch Set: merge with master again Created 4 years, 3 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/site_details.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 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 {"deleteDataPostSession", 1379 {"deleteDataPostSession",
1380 IDS_SETTINGS_SITE_SETTINGS_DELETE_DATA_POST_SESSION}, 1380 IDS_SETTINGS_SITE_SETTINGS_DELETE_DATA_POST_SESSION},
1381 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT}, 1381 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT},
1382 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT}, 1382 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT},
1383 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE}, 1383 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE},
1384 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS}, 1384 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS},
1385 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE}, 1385 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE},
1386 {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO}, 1386 {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO},
1387 {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY}, 1387 {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY},
1388 {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED}, 1388 {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},
1389 {"siteSettingsSiteDetails", IDS_SETTINGS_SITE_DETAILS},
1389 }; 1390 };
1390 AddLocalizedStringsBulk(html_source, localized_strings, 1391 AddLocalizedStringsBulk(html_source, localized_strings,
1391 arraysize(localized_strings)); 1392 arraysize(localized_strings));
1392 1393
1393 if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) { 1394 if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
1394 LocalizedString flash_strings[] = { 1395 LocalizedString flash_strings[] = {
1395 {"siteSettingsFlashAskBefore", 1396 {"siteSettingsFlashAskBefore",
1396 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING}, 1397 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING},
1397 {"siteSettingsFlashAskBeforeSubtitle", 1398 {"siteSettingsFlashAskBeforeSubtitle",
1398 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING_SUBTITLE}, 1399 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING_SUBTITLE},
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1612 #endif 1613 #endif
1613 AddUsersStrings(html_source); 1614 AddUsersStrings(html_source);
1614 AddWebContentStrings(html_source); 1615 AddWebContentStrings(html_source);
1615 1616
1616 policy_indicator::AddLocalizedStrings(html_source); 1617 policy_indicator::AddLocalizedStrings(html_source);
1617 1618
1618 html_source->SetJsonPath(kLocalizedStringsFile); 1619 html_source->SetJsonPath(kLocalizedStringsFile);
1619 } 1620 }
1620 1621
1621 } // namespace settings 1622 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_details.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698