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

Side by Side 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: Address comments 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ], 151 ],
152 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 152 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
153 'msvs_disabled_warnings': [ 4267, ], 153 'msvs_disabled_warnings': [ 4267, ],
154 }, 154 },
155 { 155 {
156 'target_name': 'app_list_unittests', 156 'target_name': 'app_list_unittests',
157 'type': 'executable', 157 'type': 'executable',
158 'dependencies': [ 158 'dependencies': [
159 '../../base/base.gyp:base', 159 '../../base/base.gyp:base',
160 '../../base/base.gyp:test_support_base', 160 '../../base/base.gyp:test_support_base',
161 # TODO: Remove this dependency. See comment for views_unittests.
162 '../../chrome/chrome_resources.gyp:packed_resources',
161 '../../skia/skia.gyp:skia', 163 '../../skia/skia.gyp:skia',
162 '../../testing/gtest.gyp:gtest', 164 '../../testing/gtest.gyp:gtest',
163 '../compositor/compositor.gyp:compositor', 165 '../compositor/compositor.gyp:compositor',
164 '../ui.gyp:run_ui_unittests', 166 '../ui.gyp:run_ui_unittests',
167 '../ui.gyp:ui',
168 '../ui.gyp:ui_resources',
169 '../ui.gyp:ui_test_support',
165 'app_list', 170 'app_list',
166 ], 171 ],
167 'sources': [ 172 'sources': [
168 'pagination_model_unittest.cc', 173 'pagination_model_unittest.cc',
174 'test/app_list_model_unittest.cc',
169 'test/app_list_test_model.cc', 175 'test/app_list_test_model.cc',
170 'test/app_list_test_model.h', 176 'test/app_list_test_model.h',
171 'test/app_list_test_view_delegate.cc', 177 'test/app_list_test_view_delegate.cc',
172 'test/app_list_test_view_delegate.h', 178 'test/app_list_test_view_delegate.h',
173 'cocoa/app_list_view_controller_unittest.mm', 179 'cocoa/app_list_view_controller_unittest.mm',
174 'cocoa/app_list_window_controller_unittest.mm', 180 'cocoa/app_list_window_controller_unittest.mm',
175 'cocoa/apps_grid_controller_unittest.mm', 181 'cocoa/apps_grid_controller_unittest.mm',
176 'cocoa/apps_search_box_controller_unittest.mm', 182 'cocoa/apps_search_box_controller_unittest.mm',
177 'cocoa/apps_search_results_controller_unittest.mm', 183 'cocoa/apps_search_results_controller_unittest.mm',
178 'cocoa/signin_view_controller_unittest.mm', 184 'cocoa/signin_view_controller_unittest.mm',
(...skipping 24 matching lines...) Expand all
203 ['component=="static_library"', { 209 ['component=="static_library"', {
204 # Needed to link to Obj-C static libraries. 210 # Needed to link to Obj-C static libraries.
205 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 211 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
206 }], 212 }],
207 ], 213 ],
208 }, { # OS!="mac" 214 }, { # OS!="mac"
209 'sources/': [ 215 'sources/': [
210 ['exclude', 'cocoa/'], 216 ['exclude', 'cocoa/'],
211 ], 217 ],
212 }], 218 }],
219 ['use_glib == 1 or OS == "ios"', {
220 'dependencies': [
221 '../base/strings/ui_strings.gyp:ui_unittest_strings',
222 ],
223 }],
213 # See http://crbug.com/162998#c4 for why this is needed. 224 # See http://crbug.com/162998#c4 for why this is needed.
214 ['OS=="linux" and linux_use_tcmalloc==1', { 225 ['OS=="linux" and linux_use_tcmalloc==1', {
215 'dependencies': [ 226 'dependencies': [
216 '../../base/allocator/allocator.gyp:allocator', 227 '../../base/allocator/allocator.gyp:allocator',
217 # The following two dependencies provide the missing 228 # The following two dependencies provide the missing
218 # symbol HeapProfilerStart in Linux component builds. 229 # symbol HeapProfilerStart in Linux component builds.
219 # They probably can be removed after http://crbug.com/263316 230 # They probably can be removed after http://crbug.com/263316
220 '../../webkit/glue/webkit_glue.gyp:glue', 231 '../../webkit/glue/webkit_glue.gyp:glue',
221 '../../webkit/glue/webkit_glue.gyp:glue_child', 232 '../../webkit/glue/webkit_glue.gyp:glue_child',
222 ], 233 ],
223 }], 234 }],
224 ], 235 ],
225 # Disable c4267 warnings until we fix size_t to int truncations. 236 # Disable c4267 warnings until we fix size_t to int truncations.
226 'msvs_disabled_warnings': [ 4267, ], 237 'msvs_disabled_warnings': [ 4267, ],
227 }, 238 },
228 ], 239 ],
229 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698