MacViews: gyp changes for a non-aura toolkit views on mac

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 485db7661123bd6d10949ce476bca550a3a98306..998d260bc1f81fc00f6ff47b40f58f93e79a1cfe 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2556,20 +2556,6 @@
             'safe_browsing_report_proto',
           ],
         }],
-        ['toolkit_views == 1', {
-          'dependencies': [
-            '../ui/wm/wm.gyp:wm',
-          ],
-          'sources!': [
-            'browser/ui/profile_reset_bubble_stub.cc',
-          ],
-        }, {  # toolkit_views == 0
-          'sources!': [
-            'browser/ui/tabs/tab_strip_layout_type.h',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
-            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
-          ],
-        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:udev',
@@ -2675,6 +2661,9 @@
           ],
         }],
         ['use_aura==1', {
+          'sources!': [
+            'browser/ui/profile_reset_bubble_stub.cc',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/screen_capture_notification_ui_stub.cc'],
             # TODO: (stevenjb/beng): Find a home for these.
@@ -2690,6 +2679,7 @@
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_resources',
+            '../ui/wm/wm.gyp:wm',
           ],
           'conditions': [
             ['OS=="win"', {
@@ -2713,6 +2703,11 @@
             }],
           ],
         }, { # else: use_aura==0
+          'sources!': [
+            'browser/ui/tabs/tab_strip_layout_type.h',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
+            'browser/ui/tabs/tab_strip_layout_type_prefs.h',
+          ],
           'sources/': [
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host.h'],
             ['exclude', '^browser/ui/views/frame/browser_desktop_window_tree_host_win.cc'],