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

Unified Diff: ui/app_list/app_list.gyp

Issue 27438002: Store AppItems as pages in AppListModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 2 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: ui/app_list/app_list.gyp
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 007d64ca6176e9d9903ae9ae2cdd94fbbd190eb4..b059ccd138335189d0ec8c89ce5465489423f40b 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -158,14 +158,20 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
+ # TODO: Remove this dependency. See comment for views_unitiests.
koz (OOO until 15th September) 2013/10/18 05:17:17 typo - views_unittests
stevenjb 2013/10/18 22:14:26 Done.
+ '../../chrome/chrome_resources.gyp:packed_resources',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
'../compositor/compositor.gyp:compositor',
'../ui.gyp:run_ui_unittests',
+ '../ui.gyp:ui',
+ '../ui.gyp:ui_resources',
+ '../ui.gyp:ui_test_support',
'app_list',
],
'sources': [
'pagination_model_unittest.cc',
+ 'test/app_list_model_unittest.cc',
'test/app_list_test_model.cc',
'test/app_list_test_model.h',
'test/app_list_test_view_delegate.cc',
@@ -210,6 +216,11 @@
['exclude', 'cocoa/'],
],
}],
+ ['use_glib == 1 or OS == "ios"', {
+ 'dependencies': [
+ '../base/strings/ui_strings.gyp:ui_unittest_strings',
+ ],
+ }],
# See http://crbug.com/162998#c4 for why this is needed.
['OS=="linux" and linux_use_tcmalloc==1', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698