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

Side by Side Diff: ash/ash.gyp

Issue 11229022: Move ash/system/web_notification message_center to ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 1 month 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
« no previous file with comments | « no previous file | ash/ash_strings.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 13 matching lines...) Expand all
24 '../content/content.gyp:content_browser', 24 '../content/content.gyp:content_browser',
25 '../ipc/ipc.gyp:ipc', 25 '../ipc/ipc.gyp:ipc',
26 '../net/net.gyp:net', 26 '../net/net.gyp:net',
27 '../skia/skia.gyp:skia', 27 '../skia/skia.gyp:skia',
28 '../third_party/icu/icu.gyp:icui18n', 28 '../third_party/icu/icu.gyp:icui18n',
29 '../third_party/icu/icu.gyp:icuuc', 29 '../third_party/icu/icu.gyp:icuuc',
30 '../ui/app_list/app_list.gyp:app_list', 30 '../ui/app_list/app_list.gyp:app_list',
31 '../ui/aura/aura.gyp:aura', 31 '../ui/aura/aura.gyp:aura',
32 '../ui/base/strings/ui_strings.gyp:ui_strings', 32 '../ui/base/strings/ui_strings.gyp:ui_strings',
33 '../ui/compositor/compositor.gyp:compositor', 33 '../ui/compositor/compositor.gyp:compositor',
34 '../ui/message_center/message_center.gyp:message_center',
34 '../ui/oak/oak.gyp:oak', 35 '../ui/oak/oak.gyp:oak',
35 '../ui/ui.gyp:ui', 36 '../ui/ui.gyp:ui',
36 '../ui/ui.gyp:ui_resources', 37 '../ui/ui.gyp:ui_resources',
37 '../ui/views/controls/webview/webview.gyp:webview', 38 '../ui/views/controls/webview/webview.gyp:webview',
38 '../ui/views/views.gyp:views', 39 '../ui/views/views.gyp:views',
39 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 40 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
40 'ash_resources', 41 'ash_resources',
41 'ash_wallpaper_resources', 42 'ash_wallpaper_resources',
42 ], 43 ],
43 'defines': [ 44 'defines': [
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 'system/tray/system_tray.cc', 201 'system/tray/system_tray.cc',
201 'system/tray/system_tray.h', 202 'system/tray/system_tray.h',
202 'system/tray/system_tray_bubble.cc', 203 'system/tray/system_tray_bubble.cc',
203 'system/tray/system_tray_bubble.h', 204 'system/tray/system_tray_bubble.h',
204 'system/tray/system_tray_delegate.cc', 205 'system/tray/system_tray_delegate.cc',
205 'system/tray/system_tray_delegate.h', 206 'system/tray/system_tray_delegate.h',
206 'system/tray/system_tray_item.cc', 207 'system/tray/system_tray_item.cc',
207 'system/tray/system_tray_item.h', 208 'system/tray/system_tray_item.h',
208 'system/tray/tray_background_view.cc', 209 'system/tray/tray_background_view.cc',
209 'system/tray/tray_background_view.h', 210 'system/tray/tray_background_view.h',
210 'system/tray/tray_bubble_view.cc',
211 'system/tray/tray_bubble_view.h',
212 'system/tray/tray_bubble_wrapper.cc', 211 'system/tray/tray_bubble_wrapper.cc',
213 'system/tray/tray_bubble_wrapper.h', 212 'system/tray/tray_bubble_wrapper.h',
214 'system/tray/tray_constants.cc', 213 'system/tray/tray_constants.cc',
215 'system/tray/tray_constants.h', 214 'system/tray/tray_constants.h',
216 'system/tray/tray_details_view.cc', 215 'system/tray/tray_details_view.cc',
217 'system/tray/tray_details_view.h', 216 'system/tray/tray_details_view.h',
218 'system/tray/tray_empty.cc', 217 'system/tray/tray_empty.cc',
219 'system/tray/tray_empty.h', 218 'system/tray/tray_empty.h',
220 'system/tray/tray_event_filter.cc', 219 'system/tray/tray_event_filter.cc',
221 'system/tray/tray_event_filter.h', 220 'system/tray/tray_event_filter.h',
(...skipping 11 matching lines...) Expand all
233 'system/tray_accessibility.h', 232 'system/tray_accessibility.h',
234 'system/tray_caps_lock.cc', 233 'system/tray_caps_lock.cc',
235 'system/tray_caps_lock.h', 234 'system/tray_caps_lock.h',
236 'system/tray_update.cc', 235 'system/tray_update.cc',
237 'system/tray_update.h', 236 'system/tray_update.h',
238 'system/user/login_status.h', 237 'system/user/login_status.h',
239 'system/user/tray_user.cc', 238 'system/user/tray_user.cc',
240 'system/user/tray_user.h', 239 'system/user/tray_user.h',
241 'system/user/update_observer.h', 240 'system/user/update_observer.h',
242 'system/user/user_observer.h', 241 'system/user/user_observer.h',
243 'system/web_notification/message_center.cc',
244 'system/web_notification/message_center.h',
245 'system/web_notification/message_center_bubble.cc',
246 'system/web_notification/message_center_bubble.h',
247 'system/web_notification/popup_bubble.cc',
248 'system/web_notification/popup_bubble.h',
249 'system/web_notification/web_notification.cc',
250 'system/web_notification/web_notification.h',
251 'system/web_notification/web_notification_bubble.cc',
252 'system/web_notification/web_notification_bubble.h',
253 'system/web_notification/web_notification_list.cc',
254 'system/web_notification/web_notification_list.h',
255 'system/web_notification/web_notification_tray.cc', 242 'system/web_notification/web_notification_tray.cc',
256 'system/web_notification/web_notification_tray.h', 243 'system/web_notification/web_notification_tray.h',
257 'system/web_notification/web_notification_view.cc',
258 'system/web_notification/web_notification_view.h',
259 'tooltips/tooltip_controller.cc', 244 'tooltips/tooltip_controller.cc',
260 'tooltips/tooltip_controller.h', 245 'tooltips/tooltip_controller.h',
261 'touch/touch_observer_hud.cc', 246 'touch/touch_observer_hud.cc',
262 'touch/touch_observer_hud.h', 247 'touch/touch_observer_hud.h',
263 'touch/touch_uma.cc', 248 'touch/touch_uma.cc',
264 'touch/touch_uma.h', 249 'touch/touch_uma.h',
265 'ui_controls_ash.cc', 250 'ui_controls_ash.cc',
266 'volume_control_delegate.h', 251 'volume_control_delegate.h',
267 'wm/app_list_controller.cc', 252 'wm/app_list_controller.cc',
268 'wm/app_list_controller.h', 253 'wm/app_list_controller.h',
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 '../build/temp_gyp/googleurl.gyp:googleurl', 470 '../build/temp_gyp/googleurl.gyp:googleurl',
486 '../skia/skia.gyp:skia', 471 '../skia/skia.gyp:skia',
487 '../testing/gtest.gyp:gtest', 472 '../testing/gtest.gyp:gtest',
488 '../third_party/icu/icu.gyp:icui18n', 473 '../third_party/icu/icu.gyp:icui18n',
489 '../third_party/icu/icu.gyp:icuuc', 474 '../third_party/icu/icu.gyp:icuuc',
490 '../ui/aura/aura.gyp:aura', 475 '../ui/aura/aura.gyp:aura',
491 '../ui/aura/aura.gyp:test_support_aura', 476 '../ui/aura/aura.gyp:test_support_aura',
492 '../ui/app_list/app_list.gyp:app_list', 477 '../ui/app_list/app_list.gyp:app_list',
493 '../ui/compositor/compositor.gyp:compositor', 478 '../ui/compositor/compositor.gyp:compositor',
494 '../ui/compositor/compositor.gyp:compositor_test_support', 479 '../ui/compositor/compositor.gyp:compositor_test_support',
480 '../ui/message_center/message_center.gyp:message_center',
495 '../ui/ui.gyp:ui', 481 '../ui/ui.gyp:ui',
496 '../ui/ui.gyp:ui_resources', 482 '../ui/ui.gyp:ui_resources',
497 '../ui/ui.gyp:ui_test_support', 483 '../ui/ui.gyp:ui_test_support',
498 '../ui/views/views.gyp:views', 484 '../ui/views/views.gyp:views',
499 '../ui/views/views.gyp:views_examples_with_content_lib', 485 '../ui/views/views.gyp:views_examples_with_content_lib',
500 '../ui/views/views.gyp:views_with_content_test_support', 486 '../ui/views/views.gyp:views_with_content_test_support',
501 'ash', 487 'ash',
502 'ash_resources', 488 'ash_resources',
503 'test_support_ash', 489 'test_support_ash',
504 ], 490 ],
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 '../chrome/chrome_resources.gyp:packed_resources', 604 '../chrome/chrome_resources.gyp:packed_resources',
619 '../content/content.gyp:content_shell_lib', 605 '../content/content.gyp:content_shell_lib',
620 '../content/content.gyp:content', 606 '../content/content.gyp:content',
621 '../skia/skia.gyp:skia', 607 '../skia/skia.gyp:skia',
622 '../third_party/icu/icu.gyp:icui18n', 608 '../third_party/icu/icu.gyp:icui18n',
623 '../third_party/icu/icu.gyp:icuuc', 609 '../third_party/icu/icu.gyp:icuuc',
624 '../ui/app_list/app_list.gyp:app_list', 610 '../ui/app_list/app_list.gyp:app_list',
625 '../ui/aura/aura.gyp:aura', 611 '../ui/aura/aura.gyp:aura',
626 '../ui/compositor/compositor.gyp:compositor', 612 '../ui/compositor/compositor.gyp:compositor',
627 '../ui/compositor/compositor.gyp:compositor_test_support', 613 '../ui/compositor/compositor.gyp:compositor_test_support',
614 '../ui/message_center/message_center.gyp:message_center',
628 '../ui/ui.gyp:ui', 615 '../ui/ui.gyp:ui',
629 '../ui/ui.gyp:ui_resources', 616 '../ui/ui.gyp:ui_resources',
630 '../ui/views/views.gyp:views', 617 '../ui/views/views.gyp:views',
631 '../ui/views/views.gyp:views_examples_with_content_lib', 618 '../ui/views/views.gyp:views_examples_with_content_lib',
632 '../ui/views/views.gyp:views_test_support', 619 '../ui/views/views.gyp:views_test_support',
633 'ash', 620 'ash',
634 'ash_resources', 621 'ash_resources',
635 ], 622 ],
636 'sources': [ 623 'sources': [
637 'shell/app_list.cc', 624 'shell/app_list.cc',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 'shell/cocoa/app-Info.plist', 683 'shell/cocoa/app-Info.plist',
697 ], 684 ],
698 'xcode_settings': { 685 'xcode_settings': {
699 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 686 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
700 }, 687 },
701 }], 688 }],
702 ], 689 ],
703 }, 690 },
704 ], 691 ],
705 } 692 }
OLDNEW
« no previous file with comments | « no previous file | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698