Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5763)

Unified Diff: chrome/chrome_browser.gypi

Issue 10900018: Introduce App Launcher for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First round of feedback Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9493ed73e2ee375c6829f51a8b91e47b2977e0c8..746d3177ad8c3db31e2b3dc8ea013c208d4027c3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3101,6 +3101,7 @@
'browser/ui/views/action_box_menu.h',
'browser/ui/views/app_menu_button_win.cc',
'browser/ui/views/app_menu_button_win.h',
+ 'browser/ui/views/app_list/app_list_controller_win.cc',
'browser/ui/views/ash/balloon_collection_impl_ash.cc',
'browser/ui/views/ash/balloon_collection_impl_ash.h',
'browser/ui/views/ash/balloon_view_ash.cc',
@@ -4168,6 +4169,7 @@
['use_ash==1', {
'sources': [
'browser/ui/app_list/app_list_controller.h',
+ 'browser/ui/app_list/app_list_controller.cc',
'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',
@@ -4728,6 +4730,7 @@
'../google_update/google_update.gyp:google_update',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
+ '../ui/app_list/app_list.gyp:app_list',
'../ui/views/views.gyp:views',
],
'export_dependent_settings': [
@@ -4736,6 +4739,17 @@
'sources': [
# Using built-in rule in vstudio for midl.
'browser/history/history_indexer.idl',
+ 'browser/ui/app_list/app_list_controller.h',
+ 'browser/ui/app_list/app_list_controller.cc',
+ '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',

Powered by Google App Engine
This is Rietveld 408576698