Revert 203217 "Revert 202987 "Reorder the NativeViews attached t..."

trunk/src/ui/views/views.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'conditions': [
       ['use_aura==1', {
@@ skipping 312 matching lines @@
         'round_rect_painter.cc',
         'round_rect_painter.h',
         'touchui/touch_editing_menu.cc',
         'touchui/touch_editing_menu.h',
         'touchui/touch_selection_controller_impl.cc',
         'touchui/touch_selection_controller_impl.h',
         'view.cc',
         'view.h',
         'view_constants.cc',
         'view_constants.h',
+        'view_constants_aura.cc',
+        'view_constants_aura.h',
         'view_aura.cc',
         'view_model.cc',
         'view_model.h',
         'view_model_utils.cc',
         'view_model_utils.h',
         'view_text_utils.cc',
         'view_text_utils.h',
         'view_win.cc',
         'views_delegate.cc',
         'views_delegate.h',
@@ skipping 73 matching lines @@
         'widget/widget_aura_utils.h',
         'widget/widget_delegate.cc',
         'widget/widget_delegate.h',
         'widget/widget_deletion_observer.cc',
         'widget/widget_deletion_observer.h',
         'widget/widget_hwnd_utils.cc',
         'widget/widget_hwnd_utils.h',
         'widget/widget_message_filter.cc',
         'widget/widget_message_filter.h',
         'widget/widget_observer.h',
+        'widget/window_reorderer.cc',
+        'widget/window_reorderer.h',
         'win/fullscreen_handler.cc',
         'win/fullscreen_handler.h',
         'win/hwnd_message_handler.cc',
         'win/hwnd_message_handler.h',
         'win/hwnd_message_handler_delegate.h',
         'win/hwnd_util.h',
         'win/hwnd_util_aurawin.cc',
         'win/hwnd_util_win.cc',
         'win/scoped_fullscreen_visibility.cc',
         'win/scoped_fullscreen_visibility.h',
@@ skipping 52 matching lines @@
                 ['include', 'widget/desktop_aura/desktop_drop_target_win.cc'],
                 ['include', 'widget/desktop_aura/desktop_root_window_host_win.cc'],
               ],
             }],
           ],
         }],
         ['use_aura==0', {
           'sources/': [
             ['exclude', 'corewm'],
             ['exclude', 'widget/desktop_aura'],
+            ['exclude', 'widget/window_reorderer.h'],
+            ['exclude', 'widget/window_reorderer.cc'],
           ],
           'sources!': [
             'widget/native_widget_aura_window_observer.cc',
             'widget/native_widget_aura_window_observer.h',
             'widget/widget_aura_utils.cc',
             'widget/widget_aura_utils.h',
           ],
         }],
         ['chromeos==1', {
           'sources/': [
@@ skipping 210 matching lines @@
         'touchui/touch_selection_controller_impl_unittest.cc',
         'view_model_unittest.cc',
         'view_model_utils_unittest.cc',
         'view_unittest.cc',
         'window/dialog_client_view_unittest.cc',
         'widget/desktop_aura/desktop_capture_client_unittest.cc',
         'widget/native_widget_aura_unittest.cc',
         'widget/native_widget_unittest.cc',
         'widget/native_widget_win_unittest.cc',
         'widget/widget_unittest.cc',
+        'widget/window_reorderer_unittest.cc',
         'run_all_unittests.cc',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources!': [
             'touchui/touch_selection_controller_impl_unittest.cc',
           ],
         }, { # use_aura==0
           'sources/': [
             ['exclude', 'widget/desktop_aura'],
@@ skipping 29 matching lines @@
             'widget/native_widget_win_unittest.cc',
           ],
         }, {  # use_aura==0
           'sources!': [
             'controls/native/native_view_host_aura_unittest.cc',
             'widget/native_widget_aura_unittest.cc',
           ],
           'sources/': [
             ['exclude', 'corewm'],
             ['exclude', 'widget/desktop_aura'],
+            ['exclude', 'widget/window_reorderer_unittest.cc']
           ],
         }],
       ],
     },  # target_name: views_unittests
     {
       'target_name': 'views_examples_lib',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../chrome/chrome_resources.gyp:packed_resources',
@@ skipping 225 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_with_content_exe
   ],
 }