| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index b51ce408a56c101845e97fbb9f7ec1a832f39f91..09d2d56dec5c406721883e8349f18fdd7ab77b7e 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -318,13 +318,10 @@
|
| ['chrome_frame_define', {
|
| 'defines': ['CHROME_FRAME_BUILD'],
|
| }],
|
| - ['toolkit_views==1', {
|
| + ['toolkit_views==1 or chromeos==1', {
|
| 'defines': ['TOOLKIT_VIEWS=1'],
|
| }],
|
| ['chromeos==1', {
|
| - 'defines': ['CHROMEOS_TRANSITIONAL=1'],
|
| - }],
|
| - ['chromeos==1 or toolkit_views==1', {
|
| 'defines': ['OS_CHROMEOS=1'],
|
| }],
|
| ['enable_gpu==1', {
|
| @@ -1025,7 +1022,7 @@
|
| ['chromeos!=1', {
|
| 'sources/': [ ['exclude', '_chromeos\\.cc$'] ]
|
| }],
|
| - ['OS!="win" and toolkit_views!=1', {
|
| + ['OS!="win" and (toolkit_views==0 and chromeos==0)', {
|
| 'sources/': [ ['exclude', '_views\\.cc$'] ]
|
| }],
|
| ],
|
|
|