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

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

Issue 2298283002: Site Settings Desktop: Support adding exceptions for incognito mode. (Closed)
Patch Set: Fix test 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
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 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 {"siteSettingsCookieRemoveAll", 1340 {"siteSettingsCookieRemoveAll",
1341 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL}, 1341 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL},
1342 {"thirdPartyCookie", IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE}, 1342 {"thirdPartyCookie", IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE},
1343 {"thirdPartyCookieSublabel", 1343 {"thirdPartyCookieSublabel",
1344 IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE_SUBLABEL}, 1344 IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE_SUBLABEL},
1345 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT}, 1345 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT},
1346 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT}, 1346 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT},
1347 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE}, 1347 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE},
1348 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS}, 1348 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS},
1349 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE}, 1349 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE},
1350 {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO},
1351 {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY},
1352 {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},
1350 }; 1353 };
1351 AddLocalizedStringsBulk(html_source, localized_strings, 1354 AddLocalizedStringsBulk(html_source, localized_strings,
1352 arraysize(localized_strings)); 1355 arraysize(localized_strings));
1353 1356
1354 if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) { 1357 if (base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
1355 LocalizedString flash_strings[] = { 1358 LocalizedString flash_strings[] = {
1356 {"siteSettingsFlashAskBefore", 1359 {"siteSettingsFlashAskBefore",
1357 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING}, 1360 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING},
1358 {"siteSettingsFlashAskBeforeSubtitle", 1361 {"siteSettingsFlashAskBeforeSubtitle",
1359 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING_SUBTITLE}, 1362 IDS_SETTINGS_SITE_SETTINGS_FLASH_ASK_BEFORE_RUNNING_SUBTITLE},
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 #endif 1576 #endif
1574 AddUsersStrings(html_source); 1577 AddUsersStrings(html_source);
1575 AddWebContentStrings(html_source); 1578 AddWebContentStrings(html_source);
1576 1579
1577 policy_indicator::AddLocalizedStrings(html_source); 1580 policy_indicator::AddLocalizedStrings(html_source);
1578 1581
1579 html_source->SetJsonPath(kLocalizedStringsFile); 1582 html_source->SetJsonPath(kLocalizedStringsFile);
1580 } 1583 }
1581 1584
1582 } // namespace settings 1585 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/browser/ui/webui/settings/site_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698