Skip to content

GitLab

T
tangled
Commit 02d46ab5 authored by blundell's avatar blundell Committed by Commit bot
Browse files
Options

Componentize error pages strings 

As a step toward componentizing the LocalizedError class for clean
integration on iOS, this CL componentizes error pages strings.

BUG=523362

Review URL: https://codereview.chromium.org/1467193003

Cr-Commit-Position: refs/heads/master@{#362970}
parent 95e2926b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 788 additions and 794 deletions
chrome/app/chromium_strings.grd
View file @ 02d46ab5
...@@ -867,49 +867,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o ...@@ -867,49 +867,6 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
Copied to Chromium Copied to Chromium
</message> </message>
<!-- Network Error Pages -->
<message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
Allow Chromium to access the network in your firewall or antivirus
settings.
</message>
<if expr="is_macosx">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
Go to
Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
and deselect any proxies that have been selected.
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
</message>
</if>
<if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chromium menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
</message>
</if>
<if expr="is_win">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
Go to
the Chromium menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
&gt;
LAN Settings
and deselect the &quot;Use a proxy server for your LAN&quot; checkbox.
</message>
</if>
<!-- Chrome OS keyboard overlay--> <!-- Chrome OS keyboard overlay-->
<if expr="chromeos"> <if expr="chromeos">
<message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu."> <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu.">
...@@ -1193,13 +1150,6 @@ and incorrect credentials. This may happen when an attacker is trying to pretend ...@@ -1193,13 +1150,6 @@ and incorrect credentials. This may happen when an attacker is trying to pretend
You cannot visit <ph name="SITE">$1<ex>google.com</ex></ph> right now because the website sent scrambled credentials that Chromium cannot process. Network errors and attacks are usually temporary, so this page will probably work later. You cannot visit <ph name="SITE">$1<ex>google.com</ex></ph> right now because the website sent scrambled credentials that Chromium cannot process. Network errors and attacks are usually temporary, so this page will probably work later.
</message> </message>
<!-- Offline interstitial -->
<if expr="not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summary of the error page when the network connection failed. May be followed by platform dependent instructions.">
Chromium can't display the webpage because your computer isn't connected to the Internet.
</message>
</if>
<!-- Runtime permission strings --> <!-- Runtime permission strings -->
<if expr="is_android"> <if expr="is_android">
<message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Chrome is missing the Android camera permission."> <message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Chrome is missing the Android camera permission.">
......
chrome/app/generated_resources.grd
View file @ 02d46ab5
This diff is collapsed.
chrome/app/google_chrome_strings.grd
View file @ 02d46ab5
...@@ -869,49 +869,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth ...@@ -869,49 +869,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
Copied to Chrome Copied to Chrome
</message> </message>
<!-- Network Error Pages -->
<message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
Allow Chrome to access the network in your firewall or antivirus
settings.
</message>
<if expr="is_macosx">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
Go to
Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
and deselect any proxies that have been selected.
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
</message>
</if>
<if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chrome menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
</message>
</if>
<if expr="is_win">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
Go to
the Chrome menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
&gt;
LAN Settings
and deselect &quot;Use a proxy server for your LAN&quot;.
</message>
</if>
<!-- Chrome OS keyboard overlay--> <!-- Chrome OS keyboard overlay-->
<if expr="chromeos"> <if expr="chromeos">
<message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu."> <message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu.">
...@@ -1195,13 +1152,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth ...@@ -1195,13 +1152,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
You cannot visit <ph name="SITE">$1<ex>google.com</ex></ph> right now because the website sent scrambled credentials that Chrome cannot process. Network errors and attacks are usually temporary, so this page will probably work later. You cannot visit <ph name="SITE">$1<ex>google.com</ex></ph> right now because the website sent scrambled credentials that Chrome cannot process. Network errors and attacks are usually temporary, so this page will probably work later.
</message> </message>
<!-- Offline interstitial -->
<if expr="not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summary of the error page when the network connection failed. May be followed by platform dependent instructions.">
Google Chrome can't display the webpage because your computer isn't connected to the Internet.
</message>
</if>
<!-- Runtime permission strings --> <!-- Runtime permission strings -->
<if expr="is_android"> <if expr="is_android">
<message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Chrome is missing the Android camera permission."> <message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Chrome is missing the Android camera permission.">
......
chrome/browser/errorpage_browsertest.cc
View file @ 02d46ab5
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
#include "components/google/core/browser/google_util.h" #include "components/google/core/browser/google_util.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_types.h"
......
chrome/browser/policy/policy_browsertest.cc
View file @ 02d46ab5
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
#include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service.h"
#include "components/security_interstitials/core/controller_client.h" #include "components/security_interstitials/core/controller_client.h"
#include "components/ssl_config/ssl_config_prefs.h" #include "components/ssl_config/ssl_config_prefs.h"
#include "components/strings/grit/components_strings.h"
#include "components/translate/core/browser/language_state.h" #include "components/translate/core/browser/language_state.h"
#include "components/translate/core/browser/translate_infobar_delegate.h" #include "components/translate/core/browser/translate_infobar_delegate.h"
#include "components/variations/service/variations_service.h" #include "components/variations/service/variations_service.h"
......
chrome/common/DEPS
View file @ 02d46ab5
...@@ -20,6 +20,7 @@ include_rules = [ ...@@ -20,6 +20,7 @@ include_rules = [
"+components/printing/common", "+components/printing/common",
"+components/policy/core/common", "+components/policy/core/common",
"+components/signin/core/common", "+components/signin/core/common",
"+components/strings/grit",
"+components/translate/core/common", "+components/translate/core/common",
"+components/url_formatter", "+components/url_formatter",
"+components/version_info", "+components/version_info",
......
chrome/common/localized_error.cc
View file @ 02d46ab5
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/grit/chromium_strings.h" #include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "chrome/grit/google_chrome_strings.h"
#include "components/error_page/common/error_page_params.h" #include "components/error_page/common/error_page_params.h"
#include "components/error_page/common/net_error_info.h" #include "components/error_page/common/net_error_info.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_google_chrome_strings.h"
#include "components/strings/grit/components_strings.h"
#include "components/url_formatter/url_formatter.h" #include "components/url_formatter/url_formatter.h"
#include "grit/components_chromium_strings.h"
#include "grit/components_google_chrome_strings.h"
#include "grit/components_strings.h"
#include "net/base/escape.h" #include "net/base/escape.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLError.h"
...@@ -32,11 +33,6 @@ ...@@ -32,11 +33,6 @@
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#endif #endif
#if defined(OS_CHROMEOS)
#include "base/command_line.h"
#include "chrome/common/chrome_switches.h"
#endif
using blink::WebURLError; using blink::WebURLError;
using error_page::OfflinePageStatus; using error_page::OfflinePageStatus;
......
components/components_chromium_strings.grd
View file @ 02d46ab5
...@@ -154,6 +154,56 @@ ...@@ -154,6 +154,56 @@
</message> </message>
</if> </if>
<if expr="not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summary of the error page when the network connection failed. May be followed by platform dependent instructions.">
Chromium can't display the webpage because your computer isn't
connected to the Internet.
</message>
</if>
<message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
Allow Chromium to access the network in your firewall or antivirus
settings.
</message>
<if expr="is_macosx">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
Go to
Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
and deselect any proxies that have been selected.
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
</message>
</if>
<if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chromium menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
</message>
</if>
<if expr="is_win">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
Go to
the Chromium menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
&gt;
LAN Settings
and deselect the &quot;Use a proxy server for your LAN&quot; checkbox.
</message>
</if>
<!-- About Flags UI --> <!-- About Flags UI -->
<if expr="not chromeos"> <if expr="not chromeos">
<message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that he needs to relaunch Chromium. Shown next to a button that says 'Relaunch Now'."> <message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that he needs to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
......
components/components_google_chrome_strings.grd
View file @ 02d46ab5
...@@ -153,6 +153,54 @@ ...@@ -153,6 +153,54 @@
again for improved performance. again for improved performance.
</message> </message>
</if> </if>
<!-- Offline interstitial -->
<if expr="not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summary of the error page when the network connection failed. May be followed by platform dependent instructions.">
Google Chrome can't display the webpage because your computer isn't connected to the Internet.
</message>
</if>
<!-- Network Error Pages -->
<message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
Allow Chrome to access the network in your firewall or antivirus
settings.
</message>
<if expr="is_macosx">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
Go to
Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
and deselect any proxies that have been selected.
</message>
</if>
<if expr="is_android or is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
</message>
</if>
<if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chrome menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
</message>
</if>
<if expr="is_win">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
Go to
the Chrome menu &gt;
<ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
&gt;
<ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
&gt;
<ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
&gt;
LAN Settings
and deselect &quot;Use a proxy server for your LAN&quot;.
</message>
</if>
<!-- About Flags UI --> <!-- About Flags UI -->
<if expr="not chromeos"> <if expr="not chromeos">
......
components/error_page_strings.grdp
View file @ 02d46ab5
This diff is collapsed.
tools/gritsettings/resource_ids
View file @ 02d46ab5
...@@ -177,113 +177,113 @@ ...@@ -177,113 +177,113 @@
"includes": [23650], "includes": [23650],
}, },
"content/content_resources.grd": { "content/content_resources.grd": {
"includes": [24650], "includes": [24150],
}, },
"content/shell/shell_resources.grd": { "content/shell/shell_resources.grd": {
"includes": [25150], "includes": [24650],
}, },
# This file is generated during the build. # This file is generated during the build.
"<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
"includes": [25400], "includes": [24900],
}, },
# iOS resources overlap with android_webview, ash, chromeos and extensions_api, # iOS resources overlap with android_webview, ash, chromeos and extensions_api,
# as these are not used on iOS. # as these are not used on iOS.
"ios/chrome/app/strings/ios_locale_settings.grd": { "ios/chrome/app/strings/ios_locale_settings.grd": {
"messages": [25650], "messages": [25150],
}, },
"ios/chrome/app/strings/ios_strings.grd": { "ios/chrome/app/strings/ios_strings.grd": {
"messages": [25655], "messages": [25155],
}, },
# Chromium strings and Google Chrome strings must start at the same id. # Chromium strings and Google Chrome strings must start at the same id.
# We only use one file depending on whether we're building Chromium or # We only use one file depending on whether we're building Chromium or
# Google Chrome. # Google Chrome.
"ios/chrome/app/strings/ios_chromium_strings.grd": { "ios/chrome/app/strings/ios_chromium_strings.grd": {
"messages": [26555], "messages": [26055],
}, },
"ios/chrome/app/strings/ios_google_chrome_strings.grd": { "ios/chrome/app/strings/ios_google_chrome_strings.grd": {
"messages": [26555], "messages": [26055],
}, },
"ios/chrome/app/theme/ios_theme_resources.grd": { "ios/chrome/app/theme/ios_theme_resources.grd": {
"structures": [26655], "structures": [26155],
}, },
"ios/chrome/today_extension/strings/ios_today_extension_strings.grd": { "ios/chrome/today_extension/strings/ios_today_extension_strings.grd": {
"messages": [27135], "messages": [26635],
}, },
"ash/ash_strings.grd": { "ash/ash_strings.grd": {
"messages": [25650], "messages": [25150],
}, },
"android_webview/ui/aw_resources.grd": { "android_webview/ui/aw_resources.grd": {
"includes": [25650], "includes": [25150],
}, },
"android_webview/ui/aw_strings.grd": { "android_webview/ui/aw_strings.grd": {
"messages": [25750], "messages": [25250],
}, },
"ui/chromeos/resources/ui_chromeos_resources.grd": { "ui/chromeos/resources/ui_chromeos_resources.grd": {
"structures": [25850], "structures": [25350],
}, },
"ui/chromeos/ui_chromeos_strings.grd": { "ui/chromeos/ui_chromeos_strings.grd": {
"messages": [25950], "messages": [25450],
}, },
"chrome/common/extensions_api_resources.grd": { "chrome/common/extensions_api_resources.grd": {
"includes": [26050], "includes": [25550],
}, },
"extensions/extensions_resources.grd": { "extensions/extensions_resources.grd": {
"includes": [26250], "includes": [25750],
}, },
"extensions/browser/resources/extensions_browser_resources.grd": { "extensions/browser/resources/extensions_browser_resources.grd": {
"structures": [26450], "structures": [25950],
}, },
"extensions/renderer/resources/extensions_renderer_resources.grd": { "extensions/renderer/resources/extensions_renderer_resources.grd": {
"includes": [26500], "includes": [26000],
"structures": [26600], "structures": [26100],
}, },
"extensions/extensions_strings.grd": { "extensions/extensions_strings.grd": {
"messages": [26650], "messages": [26150],
}, },
"extensions/shell/app_shell_resources.grd": { "extensions/shell/app_shell_resources.grd": {
"includes": [27050], "includes": [26550],
}, },
"chrome/browser/resources/memory_internals_resources.grd": { "chrome/browser/resources/memory_internals_resources.grd": {
"includes": [27150], "includes": [26650],
}, },
"chrome/browser/resources/password_manager_internals_resources.grd": { "chrome/browser/resources/password_manager_internals_resources.grd": {
"includes": [27350], "includes": [26850],
}, },
"device/bluetooth/bluetooth_strings.grd": { "device/bluetooth/bluetooth_strings.grd": {
"messages": [27650], "messages": [27150],
}, },
"ui/file_manager/file_manager_resources.grd": { "ui/file_manager/file_manager_resources.grd": {
"includes": [27760], "includes": [27260],
}, },
"components/chrome_apps/chrome_apps_resources.grd": { "components/chrome_apps/chrome_apps_resources.grd": {
"includes": [27940], "includes": [27440],
}, },
"ui/login/login_resources.grd": { "ui/login/login_resources.grd": {
"includes": [27960], "includes": [27460],
}, },
"chrome/browser/resources/translate_internals_resources.grd": { "chrome/browser/resources/translate_internals_resources.grd": {
"includes": [28160], "includes": [27660],
}, },
"chrome/browser/resources/sync_file_system_internals_resources.grd": { "chrome/browser/resources/sync_file_system_internals_resources.grd": {
"includes": [28660], "includes": [28160],
}, },
"chrome/app/address_input_strings.grd": { "chrome/app/address_input_strings.grd": {
"messages": [28760], "messages": [28260],
}, },
"remoting/resources/remoting_strings.grd": { "remoting/resources/remoting_strings.grd": {
"messages": [29210], "messages": [28710],
}, },
"components/components_strings.grd": { "components/components_strings.grd": {
"messages": [29660], "messages": [29160],
}, },
# Chromium strings and Google Chrome strings must start at the same id. # Chromium strings and Google Chrome strings must start at the same id.
# We only use one file depending on whether we're building Chromium or # We only use one file depending on whether we're building Chromium or
# Google Chrome. # Google Chrome.
"components/components_chromium_strings.grd": { "components/components_chromium_strings.grd": {
"messages": [30160], "messages": [30150],
}, },
"components/components_google_chrome_strings.grd": { "components/components_google_chrome_strings.grd": {
"messages": [30160], "messages": [30150],
}, },
"components/resources/components_resources.grd": { "components/resources/components_resources.grd": {
"includes": [30175], "includes": [30175],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment