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

Unified Diff: chrome/chrome_browser.gypi

Issue 10871011: Move common app_list delegate code to chrome/browser/ui/app_list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unit test file only in chrome 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
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8a54e5c40fa418ce4676ea5a1ccd0a77da558d06..3d830f39d351aebb2dc512dd2e01bc0bb4ce919f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2495,18 +2495,8 @@
'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
'browser/ui/ash/ash_init.cc',
'browser/ui/ash/ash_init.h',
- 'browser/ui/ash/app_list/app_list_controller.h',
'browser/ui/ash/app_list/app_list_controller_ash.h',
'browser/ui/ash/app_list/app_list_controller_ash.cc',
- 'browser/ui/ash/app_list/app_list_view_delegate.cc',
- 'browser/ui/ash/app_list/app_list_view_delegate.h',
- 'browser/ui/ash/app_list/apps_model_builder.cc',
- 'browser/ui/ash/app_list/apps_model_builder.h',
- 'browser/ui/ash/app_list/chrome_app_list_item.h',
- 'browser/ui/ash/app_list/extension_app_item.cc',
- 'browser/ui/ash/app_list/extension_app_item.h',
- 'browser/ui/ash/app_list/search_builder.cc',
- 'browser/ui/ash/app_list/search_builder.h',
'browser/ui/ash/ash_util.cc',
'browser/ui/ash/ash_util.h',
'browser/ui/ash/caps_lock_handler.cc',
@@ -4759,6 +4749,18 @@
],
}],
['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',
+ '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',
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698