Add Aura support to views:

- change aura GYP_DEFINE to use_aura to be consistent with other switches
- add gfx::NativeView/Window typedefs
- add NativeWidgetAura/etc.
- update some ifdefs and includes to build on windows.

http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7741001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98234 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 525bdeb..d5862d9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -44,7 +44,7 @@
           'views_compositor%': 0,
           
           # Whether or not we are building with the Aura window manager.
-          'aura_wm%': 0,
+          'use_aura%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
@@ -52,7 +52,7 @@
         'touchui%': '<(touchui)',
         'webui_dialogs%': '<(webui_dialogs)',
         'views_compositor%': '<(views_compositor)',
-        'aura_wm%': '<(aura_wm)',
+        'use_aura%': '<(use_aura)',
 
         # Compute the architecture that we're building on.
         'conditions': [
@@ -87,7 +87,7 @@
           }],
           
           # Use the views compositor when using the Aura window manager.
-          ['aura_wm==1', {
+          ['use_aura==1', {
             'views_compositor%': 1,
           }],
         ],
@@ -101,7 +101,7 @@
       'toolkit_views%': '<(toolkit_views)',
       'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
       'views_compositor%': '<(views_compositor)',
-      'aura_wm%': '<(aura_wm)',
+      'use_aura%': '<(use_aura)',
 
       # We used to provide a variable for changing how libraries were built.
       # This variable remains until we can clean up all the users.
@@ -295,7 +295,7 @@
     'toolkit_views%': '<(toolkit_views)',
     'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)',
     'views_compositor%': '<(views_compositor)',
-    'aura_wm%': '<(aura_wm)',
+    'use_aura%': '<(use_aura)',
     'os_posix%': '<(os_posix)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
     'use_skia%': '<(use_skia)',
@@ -786,8 +786,8 @@
       ['views_compositor==1', {
         'defines': ['VIEWS_COMPOSITOR=1'],
       }],
-      ['aura_wm==1', {
-        'defines': ['AURA_WM=1'],
+      ['use_aura==1', {
+        'defines': ['USE_AURA=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
@@ -1059,6 +1059,9 @@
           ['toolkit_views==0', {
             'sources/': [ ['exclude', '_views\\.(h|cc)$'] ]
           }],
+          ['use_aura==0', {
+            'sources/': [ ['exclude', '_aura\\.(h|cc)$'] ]
+          }],
         ],
       }],
     ],  # target_conditions for 'target_defaults'