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

Side by Side Diff: ash/ash.gyp

Issue 10824023: Revert "Revert 148383 - Move the keyboard overlay view to ash." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « ash/DEPS ('k') | 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 10
(...skipping 15 matching lines...) Expand all
26 '../third_party/icu/icu.gyp:icui18n', 26 '../third_party/icu/icu.gyp:icui18n',
27 '../third_party/icu/icu.gyp:icuuc', 27 '../third_party/icu/icu.gyp:icuuc',
28 '../ui/app_list/app_list.gyp:app_list', 28 '../ui/app_list/app_list.gyp:app_list',
29 '../ui/aura/aura.gyp:aura', 29 '../ui/aura/aura.gyp:aura',
30 '../ui/base/strings/ui_strings.gyp:ui_strings', 30 '../ui/base/strings/ui_strings.gyp:ui_strings',
31 '../ui/compositor/compositor.gyp:compositor', 31 '../ui/compositor/compositor.gyp:compositor',
32 '../ui/oak/oak.gyp:oak', 32 '../ui/oak/oak.gyp:oak',
33 '../ui/ui.gyp:ui', 33 '../ui/ui.gyp:ui',
34 '../ui/ui.gyp:ui_resources', 34 '../ui/ui.gyp:ui_resources',
35 '../ui/views/views.gyp:views', 35 '../ui/views/views.gyp:views',
36 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
36 ], 37 ],
37 'defines': [ 38 'defines': [
38 'ASH_IMPLEMENTATION', 39 'ASH_IMPLEMENTATION',
39 ], 40 ],
40 'sources': [ 41 'sources': [
41 # All .cc, .h under ash, except unittests 42 # All .cc, .h under ash, except unittests
42 'accelerators/accelerator_controller.cc', 43 'accelerators/accelerator_controller.cc',
43 'accelerators/accelerator_controller.h', 44 'accelerators/accelerator_controller.h',
44 'accelerators/accelerator_dispatcher.cc', 45 'accelerators/accelerator_dispatcher.cc',
45 'accelerators/accelerator_dispatcher.h', 46 'accelerators/accelerator_dispatcher.h',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'display/display_controller.cc', 104 'display/display_controller.cc',
104 'display/display_controller.h', 105 'display/display_controller.h',
105 'display/mouse_cursor_event_filter.cc', 106 'display/mouse_cursor_event_filter.cc',
106 'display/mouse_cursor_event_filter.h', 107 'display/mouse_cursor_event_filter.h',
107 'display/multi_display_manager.cc', 108 'display/multi_display_manager.cc',
108 'display/multi_display_manager.h', 109 'display/multi_display_manager.h',
109 'display/screen_position_controller.cc', 110 'display/screen_position_controller.cc',
110 'display/screen_position_controller.h', 111 'display/screen_position_controller.h',
111 'display/secondary_display_view.cc', 112 'display/secondary_display_view.cc',
112 'display/secondary_display_view.h', 113 'display/secondary_display_view.h',
114 'keyboard_overlay/keyboard_overlay_delegate.cc',
115 'keyboard_overlay/keyboard_overlay_delegate.h',
116 'keyboard_overlay/keyboard_overlay_view.cc',
117 'keyboard_overlay/keyboard_overlay_view.h',
113 'root_window_controller.cc', 118 'root_window_controller.cc',
114 'root_window_controller.h', 119 'root_window_controller.h',
115 'rotator/screen_rotation.cc', 120 'rotator/screen_rotation.cc',
116 'rotator/screen_rotation.h', 121 'rotator/screen_rotation.h',
117 'screen_ash.cc', 122 'screen_ash.cc',
118 'screen_ash.h', 123 'screen_ash.h',
119 'screensaver/screensaver_view.cc', 124 'screensaver/screensaver_view.cc',
120 'screensaver/screensaver_view.h', 125 'screensaver/screensaver_view.h',
121 'screenshot_delegate.h', 126 'screenshot_delegate.h',
122 'shell.cc', 127 'shell.cc',
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 'shell/cocoa/app-Info.plist', 603 'shell/cocoa/app-Info.plist',
599 ], 604 ],
600 'xcode_settings': { 605 'xcode_settings': {
601 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', 606 'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
602 }, 607 },
603 }], 608 }],
604 ], 609 ],
605 }, 610 },
606 ], 611 ],
607 } 612 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698