From a678f3f9eae776faa42469cfc9ca86b0ad68d03e Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Mon, 12 Oct 2009 23:58:03 +0000 Subject: 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 --- build/common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build') diff --git a/build/common.gypi b/build/common.gypi index 2e12840..b7ea034 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -269,7 +269,7 @@ ['toolkit_views==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], - ['chromeos==1', { + ['chromeos==1 or toolkit_views==1', { 'defines': ['OS_CHROMEOS=1'], }], ['fastbuild!=0', { -- cgit v1.1