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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 10900018: Introduce App Launcher for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase gyp file for ui extraction Created 8 years, 3 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index d2d16fd7368a0df864cce49a511219ceff7522be..c278408885ef50a13c17956860b4d183d37ebe1b 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -124,6 +124,8 @@
'browser/ui/android/tab_model/tab_model_list.cc',
'browser/ui/android/tab_model/tab_model_list.h',
'browser/ui/android/tab_restore_service_delegate_android.cc',
+ 'browser/ui/app_list/app_list_controller.h',
+ 'browser/ui/app_list/app_list_controller.cc',
'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
'browser/ui/app_modal_dialogs/app_modal_dialog.h',
'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
@@ -1279,6 +1281,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',
@@ -2142,7 +2145,6 @@
}],
['use_ash==1', {
'sources': [
- 'browser/ui/app_list/app_list_controller.h',
'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',
@@ -2522,6 +2524,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/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
],
@@ -2530,6 +2533,15 @@
'../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',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698