summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:29:41 +0000
committeraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 00:29:41 +0000
commitd6113978cb5dae92f84a220079c25a5fd2ff0a7e (patch)
tree874d814acf592d1ae0015a8e073ec1d28bd5f650 /chrome/app
parent8a57629950fe0502b5bfaae3eecaa025f3bb705f (diff)
downloadchromium_src-d6113978cb5dae92f84a220079c25a5fd2ff0a7e.zip
chromium_src-d6113978cb5dae92f84a220079c25a5fd2ff0a7e.tar.gz
chromium_src-d6113978cb5dae92f84a220079c25a5fd2ff0a7e.tar.bz2
Fully exclude about:system from Android builds.
chrome://system is removed from ChromeWebUiControllerFactory so the rest of the resources for it should be removed as well. BUG=326023 Review URL: https://codereview.chromium.org/135863003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd56
1 files changed, 29 insertions, 27 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9bcdd86..0fe2e38 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7131,33 +7131,35 @@ Keep your key file in a safe place. You will need it to create new versions of y
</if>
<!-- about:system strings -->
- <message name="IDS_ABOUT_SYS_TITLE" desc="about:system page title">
- About System
- </message>
- <message name="IDS_ABOUT_SYS_DESC" desc="about:system page description">
- System diagnostic data
- </message>
- <message name="IDS_ABOUT_SYS_TABLE_TITLE" desc="Title of a table that contains system details">
- Details
- </message>
- <message name="IDS_ABOUT_SYS_LOG_FILE_TABLE_TITLE" desc="Title of a table that contains details from an uploaded log">
- Details: <ph name="FILE_NAME">$1<ex>Log.txt</ex></ph>
- </message>
- <message name="IDS_ABOUT_SYS_EXPAND_ALL" desc="name of a button that shows (expands) all system details">
- Expand all...
- </message>
- <message name="IDS_ABOUT_SYS_COLLAPSE_ALL" desc="name of a button that hides (collapses) all system details">
- Collapse all...
- </message>
- <message name="IDS_ABOUT_SYS_EXPAND" desc="name of a button that shows (expands) specific system details">
- Expand...
- </message>
- <message name="IDS_ABOUT_SYS_COLLAPSE" desc="name of a button that hides (collapses) specific system details">
- Collapse...
- </message>
- <message name="IDS_ABOUT_SYS_PARSE_ERROR" desc="error message displayed if parsing of custom uploaded log fails">
- Unable to parse file: <ph name="FILE_NAME">$1<ex>Log.txt</ex></ph>
- </message>
+ <if expr="not is_android">
+ <message name="IDS_ABOUT_SYS_TITLE" desc="about:system page title">
+ About System
+ </message>
+ <message name="IDS_ABOUT_SYS_DESC" desc="about:system page description">
+ System diagnostic data
+ </message>
+ <message name="IDS_ABOUT_SYS_TABLE_TITLE" desc="Title of a table that contains system details">
+ Details
+ </message>
+ <message name="IDS_ABOUT_SYS_LOG_FILE_TABLE_TITLE" desc="Title of a table that contains details from an uploaded log">
+ Details: <ph name="FILE_NAME">$1<ex>Log.txt</ex></ph>
+ </message>
+ <message name="IDS_ABOUT_SYS_EXPAND_ALL" desc="name of a button that shows (expands) all system details">
+ Expand all...
+ </message>
+ <message name="IDS_ABOUT_SYS_COLLAPSE_ALL" desc="name of a button that hides (collapses) all system details">
+ Collapse all...
+ </message>
+ <message name="IDS_ABOUT_SYS_EXPAND" desc="name of a button that shows (expands) specific system details">
+ Expand...
+ </message>
+ <message name="IDS_ABOUT_SYS_COLLAPSE" desc="name of a button that hides (collapses) specific system details">
+ Collapse...
+ </message>
+ <message name="IDS_ABOUT_SYS_PARSE_ERROR" desc="error message displayed if parsing of custom uploaded log fails">
+ Unable to parse file: <ph name="FILE_NAME">$1<ex>Log.txt</ex></ph>
+ </message>
+ </if>
<if expr="pp_ifdef('chromeos')">
<!-- Locale Change Notification-->