diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 23:58:03 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 23:58:03 +0000 |
| commit | a678f3f9eae776faa42469cfc9ca86b0ad68d03e (patch) | |
| tree | 9b44ddb5b19aa8115baddf40b901fcb0e9b900a0 /chrome/app/generated_resources.grd | |
| parent | 7beca7d1d2842cf7e5fe799a3f87b1481fa277fa (diff) | |
| download | chromium_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/generated_resources.grd')
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8015426..912e464 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5646,7 +5646,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </if> <!-- Chrome OS Strings --> - <if expr="pp_ifdef('chromeos')"> + <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_NETWORK"> Network </message> |