Put the pop-up app launcher behind a compile-time flag, and provide defines.

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 85d85b080115bbadded3adb2d8e5cd0d1f5039ba..401b7efcdcc31807f45e5410e1441a87feb56138 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2279,21 +2279,9 @@
           ],
         }],
         ['use_ash==1', {
-          'sources': [
-            'browser/ui/app_list/app_list_view_delegate.cc',
-            'browser/ui/app_list/app_list_view_delegate.h',
-            'browser/ui/app_list/apps_model_builder.cc',
-            'browser/ui/app_list/apps_model_builder.h',
-            'browser/ui/app_list/chrome_app_list_item.h',
-            'browser/ui/app_list/extension_app_item.cc',
-            'browser/ui/app_list/extension_app_item.h',
-            'browser/ui/app_list/search_builder.cc',
-            'browser/ui/app_list/search_builder.h',
-          ],
           'dependencies': [
             '../ash/ash.gyp:ash',
             '../ash/ash_strings.gyp:ash_strings',
-            '../ui/app_list/app_list.gyp:app_list',
             '../ui/message_center/message_center.gyp:message_center',
           ],
         }],
@@ -2648,15 +2636,6 @@
             '../ui/views/views.gyp:views',
           ],
           'sources': [
-            'browser/ui/app_list/app_list_view_delegate.cc',
-            'browser/ui/app_list/app_list_view_delegate.h',
-            'browser/ui/app_list/apps_model_builder.cc',
-            'browser/ui/app_list/apps_model_builder.h',
-            'browser/ui/app_list/chrome_app_list_item.h',
-            'browser/ui/app_list/extension_app_item.cc',
-            'browser/ui/app_list/extension_app_item.h',
-            'browser/ui/app_list/search_builder.cc',
-            'browser/ui/app_list/search_builder.h',
             'browser/ui/views/network_profile_bubble_view.cc',
             'browser/ui/views/network_profile_bubble_view.h',
             'browser/ui/webui/conflicts_ui.cc',
@@ -2756,6 +2735,26 @@
             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.h'],
           ]}
         ],
+        ['enable_app_list==1', {
+          'dependencies': [
+            '../ui/app_list/app_list.gyp:app_list',
+          ],
+          'sources': [
+            'browser/ui/app_list/app_list_view_delegate.cc',

[sky, 2012/11/14 15:54:57]

How come we don't do the normal pattern of listing the files with all other
files and excluding where not appropriate? See comment on line 67.

[tapted, 2012/11/14 22:35:37]

I flip-flopped around this a bit in earlier patchsets, since it wasn't the prior
method for app_list.. But with changes to startup_browser_creator_impl.cc the
excludes are much cleaner, so I'm fully sold. Done.

+            'browser/ui/app_list/app_list_view_delegate.h',
+            'browser/ui/app_list/apps_model_builder.cc',
+            'browser/ui/app_list/apps_model_builder.h',
+            'browser/ui/app_list/chrome_app_list_item.h',
+            'browser/ui/app_list/extension_app_item.cc',
+            'browser/ui/app_list/extension_app_item.h',
+            'browser/ui/app_list/search_builder.cc',
+            'browser/ui/app_list/search_builder.h',
+          ]
+        }, { # else: enable_app_list==0
+          'sources!': [
+            'browser/ui/views/app_list/app_list_controller_win.cc'
+          ]
+        }],
       ],
     },
   ],