summaryrefslogtreecommitdiffstats
path: root/chrome/app/chromium_strings.grd
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:58:03 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:58:03 +0000
commita678f3f9eae776faa42469cfc9ca86b0ad68d03e (patch)
tree9b44ddb5b19aa8115baddf40b901fcb0e9b900a0 /chrome/app/chromium_strings.grd
parent7beca7d1d2842cf7e5fe799a3f87b1481fa277fa (diff)
downloadchromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.zip
chromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.tar.gz
chromium_src-a678f3f9eae776faa42469cfc9ca86b0ad68d03e.tar.bz2
include CHROMEOS files and defintions in TOOLKIT_VEIWS build.
* changed gyp files so that all files compiled for chrome os will be also compiled when toolkit_views==1 * changed to define OS_CHROMEOS when toolkit_views==1 * changed TabOverbiewMessageListener to use BrowserView instead of BrowserWindowGtk when toolkit_views==1 I left one for CHROME_NOTIFY_FLOATING_TAB_OVER_TOPLEVEL b/c i couldn't figure out how to get gdkwindow from xid. Looks like I need to register it somewhere Note: Nicolas updated trybot and buildbot to include chromeos dependency, so this all should compile fine. BUG=none TEST=run views unit test and browser. Review URL: http://codereview.chromium.org/262027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chromium_strings.grd')
-rw-r--r--chrome/app/chromium_strings.grd2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index da38b89..9bd0485 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -127,7 +127,7 @@ be available for now. -->
<message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
Chromium
</message>
- <if expr="pp_ifdef('chromeos')">
+ <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
<message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
Chromium OS
</message>