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 /base/base.gyp | |
| 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 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/base.gyp b/base/base.gyp index 45c85e0..b9d8e95 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -379,7 +379,7 @@ 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], ['exclude', '\\.mm?$' ] ], 'conditions': [ - [ 'chromeos==1', { + [ 'chromeos==1 or toolkit_views==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], @@ -713,7 +713,7 @@ 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], ['exclude', '\\.mm?$' ] ], 'conditions': [ - [ 'chromeos==1', { + [ 'chromeos==1 or toolkit_views==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], |