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

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

Issue 2919853002: [MD settings] site exceptions, use embedding origin rather than embeddingDisplayName (Closed)
Patch Set: remove IDS reference Created 3 years, 6 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 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 IDS_SETTINGS_ADD_SITE_EXCEPTION_PLACEHOLDER}, 1679 IDS_SETTINGS_ADD_SITE_EXCEPTION_PLACEHOLDER},
1680 {"addSiteTitle", IDS_SETTINGS_ADD_SITE_TITLE}, 1680 {"addSiteTitle", IDS_SETTINGS_ADD_SITE_TITLE},
1681 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE}, 1681 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE},
1682 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE}, 1682 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE},
1683 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID}, 1683 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID},
1684 {"cookieDatabaseStorage", IDS_SETTINGS_COOKIES_DATABASE_STORAGE}, 1684 {"cookieDatabaseStorage", IDS_SETTINGS_COOKIES_DATABASE_STORAGE},
1685 {"cookieFileSystem", IDS_SETTINGS_COOKIES_FILE_SYSTEM}, 1685 {"cookieFileSystem", IDS_SETTINGS_COOKIES_FILE_SYSTEM},
1686 {"cookieFlashLso", IDS_SETTINGS_COOKIES_FLASH_LSO}, 1686 {"cookieFlashLso", IDS_SETTINGS_COOKIES_FLASH_LSO},
1687 {"cookieLocalStorage", IDS_SETTINGS_COOKIES_LOCAL_STORAGE}, 1687 {"cookieLocalStorage", IDS_SETTINGS_COOKIES_LOCAL_STORAGE},
1688 {"cookieMediaLicense", IDS_SETTINGS_COOKIES_MEDIA_LICENSE}, 1688 {"cookieMediaLicense", IDS_SETTINGS_COOKIES_MEDIA_LICENSE},
1689 {"cookiePlural", IDS_SETTINGS_COOKIES_PLURAL_COOKIES}, 1689 {"cookiePlural", IDS_SETTINGS_COOKIES_PLURAL_COOKIES},
msramek 2017/06/01 23:09:59 Not related to this patchset, but this is wrong -
dschuyler 2017/06/13 20:49:25 Added Issue 732610 to track this.
msramek 2017/06/28 19:41:33 Thank you!
1690 {"cookieServiceWorker", IDS_SETTINGS_COOKIES_SERVICE_WORKER}, 1690 {"cookieServiceWorker", IDS_SETTINGS_COOKIES_SERVICE_WORKER},
1691 {"cookieSingular", IDS_SETTINGS_COOKIES_SINGLE_COOKIE}, 1691 {"cookieSingular", IDS_SETTINGS_COOKIES_SINGLE_COOKIE},
1692 {"embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST},
dschuyler 2017/06/01 22:07:12 IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST is sti
msramek 2017/06/01 23:09:59 Acknowledged.
1693 {"editSiteTitle", IDS_SETTINGS_EDIT_SITE_TITLE}, 1692 {"editSiteTitle", IDS_SETTINGS_EDIT_SITE_TITLE},
1694 {"appCacheManifest", IDS_SETTINGS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL}, 1693 {"appCacheManifest", IDS_SETTINGS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL},
1695 {"cacheStorageLastModified", 1694 {"cacheStorageLastModified",
1696 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL}, 1695 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
1697 {"cacheStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1696 {"cacheStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1698 {"cacheStorageSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1697 {"cacheStorageSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1699 {"channelIdServerId", IDS_SETTINGS_COOKIES_CHANNEL_ID_ORIGIN_LABEL}, 1698 {"channelIdServerId", IDS_SETTINGS_COOKIES_CHANNEL_ID_ORIGIN_LABEL},
1700 {"channelIdType", IDS_SETTINGS_COOKIES_CHANNEL_ID_TYPE_LABEL}, 1699 {"channelIdType", IDS_SETTINGS_COOKIES_CHANNEL_ID_TYPE_LABEL},
1701 {"channelIdCreated", IDS_SETTINGS_COOKIES_CHANNEL_ID_CREATED_LABEL}, 1700 {"channelIdCreated", IDS_SETTINGS_COOKIES_CHANNEL_ID_CREATED_LABEL},
1702 {"channelIdExpires", IDS_SETTINGS_COOKIES_CHANNEL_ID_EXPIRES_LABEL}, 1701 {"channelIdExpires", IDS_SETTINGS_COOKIES_CHANNEL_ID_EXPIRES_LABEL},
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 2147
2149 #if defined(OS_CHROMEOS) 2148 #if defined(OS_CHROMEOS)
2150 chromeos::network_element::AddLocalizedStrings(html_source); 2149 chromeos::network_element::AddLocalizedStrings(html_source);
2151 #endif 2150 #endif
2152 policy_indicator::AddLocalizedStrings(html_source); 2151 policy_indicator::AddLocalizedStrings(html_source);
2153 2152
2154 html_source->SetJsonPath(kLocalizedStringsFile); 2153 html_source->SetJsonPath(kLocalizedStringsFile);
2155 } 2154 }
2156 2155
2157 } // namespace settings 2156 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698