Introducing TOOLKIT_USES_PURE_VIEWS

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 75f1e5f5b39e2e0c22b655f5eb9c4a55cefb3288..7901f65dca5b6a5f8814080421ade98ea3437c19 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -21,6 +21,9 @@
           # Whether we're building a ChromeOS build.
           'chromeos%': 0,
 
+          # Whether the Views toolkit is Pure or GTK

[oshima, 2011/06/30 00:06:32]

Please add comment that this is an intermediate solution and will be removed
once migration is completed.

[Emmanuel Saint-loubert-Bié, 2011/06/30 00:23:29]

Done.

+          'toolkit_pure_views%': 0,

[oshima, 2011/06/30 00:06:32]

toolkit_uses_pure_views would be better.

[Emmanuel Saint-loubert-Bié, 2011/06/30 00:23:29]

Done.

+
           # Disable touch support by default.
           'touchui%': 0,
 
@@ -29,6 +32,7 @@
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
+        'toolkit_pure_views%': '<(toolkit_pure_views)',
         'touchui%': '<(touchui)',
         'views_compositor%': '<(views_compositor)',
 
@@ -45,12 +49,19 @@
           }],
 
           # Set default value of toolkit_views on for Windows, Chrome OS
-          # and the touch UI.
-          ['OS=="win" or chromeos==1 or touchui==1', {
+          # and the touch UI. Also toolkit_pure_views implies toolkit_views.
+          ['OS=="win" or chromeos==1 or touchui==1 or toolkit_pure_views==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
+          
+          # Views are always Pure in Touch case
+          ['touchui==1', {
+            'toolkit_pure_views%': 1,
+          }, {
+            'toolkit_pure_views%': 0,
+          }],
         ],
       },
 
@@ -59,6 +70,7 @@
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
+      'toolkit_pure_views%': '<(toolkit_pure_views)',
       'views_compositor%': '<(views_compositor)',
 
       # We used to provide a variable for changing how libraries were built.
@@ -220,6 +232,7 @@
     'host_arch%': '<(host_arch)',
     'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
+    'toolkit_pure_views%': '<(toolkit_pure_views)',
     'views_compositor%': '<(views_compositor)',
     'os_posix%': '<(os_posix)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ -569,6 +582,9 @@
       ['toolkit_views==1', {
         'grit_defines': ['-D', 'toolkit_views'],
       }],
+      ['toolkit_pure_views==1', {
+        'grit_defines': ['-D', 'toolkit_pure_views'],
+      }],
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
@@ -662,6 +678,9 @@
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
+      ['toolkit_pure_views==1', {
+        'defines': ['TOOLKIT_USES_PURE_VIEWS=1'],
+      }],
       ['views_compositor==1', {
         'defines': ['VIEWS_COMPOSITOR=1'],
       }],