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

Side by Side Diff: ui/chromeos/ui_chromeos.gyp

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: Created 6 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 {
11 'target_name': 'ui_chromeos_resources', 11 'target_name': 'ui_chromeos_resources',
12 'type': 'none', 12 'type': 'none',
13 'variables': { 13 'variables': {
14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources', 14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources',
15 }, 15 },
16 'actions': [ 16 'actions': [
17 { 17 {
18 'action_name': 'ui_chromeos_resources', 18 'action_name': 'ui_chromeos_resources',
19 'variables': { 19 'variables': {
20 'grit_grd_file': 'resources/ui_chromeos_resources.grd', 20 'grit_grd_file': 'resources/ui_chromeos_resources.grd',
21 }, 21 },
22 'includes': [ '../../build/grit_action.gypi' ], 22 'includes': [ '../../build/grit_action.gypi' ],
23 }, 23 },
24 ], 24 ],
25 'includes': [ '../../build/grit_target.gypi' ], 25 'includes': [ '../../build/grit_target.gypi' ],
26 }, 26 }, # target_name: ui_chromeos_resources
27 { 27 {
28 'target_name': 'ui_chromeos_strings', 28 'target_name': 'ui_chromeos_strings',
29 'type': 'none', 29 'type': 'none',
30 'variables': { 30 'variables': {
31 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings', 31 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings',
32 }, 32 },
33 'actions': [ 33 'actions': [
34 { 34 {
35 'action_name': 'generate_ui_chromeos_strings', 35 'action_name': 'generate_ui_chromeos_strings',
36 'variables': { 36 'variables': {
37 'grit_grd_file': 'ui_chromeos_strings.grd', 37 'grit_grd_file': 'ui_chromeos_strings.grd',
38 }, 38 },
39 'includes': [ '../../build/grit_action.gypi' ], 39 'includes': [ '../../build/grit_action.gypi' ],
40 }, 40 },
41 ], 41 ],
42 'includes': [ '../../build/grit_target.gypi' ], 42 'includes': [ '../../build/grit_target.gypi' ],
43 }, 43 }, # target_name: ui_chromeos_strings
44 { 44 {
45 'target_name': 'ui_chromeos', 45 'target_name': 'ui_chromeos',
46 'type': '<(component)', 46 'type': '<(component)',
47 'dependencies': [ 47 'dependencies': [
48 '../../base/base.gyp:base', 48 '../../base/base.gyp:base',
49 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
49 '../../chromeos/chromeos.gyp:power_manager_proto', 50 '../../chromeos/chromeos.gyp:power_manager_proto',
50 '../../skia/skia.gyp:skia', 51 '../../skia/skia.gyp:skia',
51 '../aura/aura.gyp:aura', 52 '../aura/aura.gyp:aura',
52 '../events/events.gyp:events', 53 '../events/events.gyp:events',
53 '../events/events.gyp:gesture_detection', 54 '../events/events.gyp:gesture_detection',
54 '../message_center/message_center.gyp:message_center', 55 '../message_center/message_center.gyp:message_center',
55 '../views/views.gyp:views', 56 '../views/views.gyp:views',
56 '../wm/wm.gyp:wm', 57 '../wm/wm.gyp:wm',
57 'ui_chromeos_resources', 58 'ui_chromeos_resources',
58 'ui_chromeos_strings', 59 'ui_chromeos_strings',
59 ], 60 ],
60 'defines': [ 61 'defines': [
61 'UI_CHROMEOS_IMPLEMENTATION', 62 'UI_CHROMEOS_IMPLEMENTATION',
62 ], 63 ],
63 'sources': [ 64 'sources': [
64 'accessibility_types.h', 65 'accessibility_types.h',
66 'ime/candidate_view.cc',
67 'ime/candidate_view.h',
68 'ime/candidate_window_view.cc',
69 'ime/candidate_window_view.h',
70 'ime/infolist_window.cc',
71 'ime/infolist_window.h',
72 'ime/input_method_menu_item.cc',
73 'ime/input_method_menu_item.h',
74 'ime/input_method_menu_manager.cc',
75 'ime/input_method_menu_manager.h',
76 'ime/mode_indicator_view.cc',
77 'ime/mode_indicator_view.h',
65 'network/network_connect.cc', 78 'network/network_connect.cc',
66 'network/network_connect.h', 79 'network/network_connect.h',
67 'network/network_icon.cc', 80 'network/network_icon.cc',
68 'network/network_icon.h', 81 'network/network_icon.h',
69 'network/network_icon_animation.cc', 82 'network/network_icon_animation.cc',
70 'network/network_icon_animation.h', 83 'network/network_icon_animation.h',
71 'network/network_icon_animation_observer.h', 84 'network/network_icon_animation_observer.h',
72 'network/network_info.cc', 85 'network/network_info.cc',
73 'network/network_info.h', 86 'network/network_info.h',
74 'network/network_list.cc', 87 'network/network_list.cc',
75 'network/network_list.h', 88 'network/network_list.h',
76 'network/network_list_delegate.h', 89 'network/network_list_delegate.h',
77 'network/network_state_notifier.cc', 90 'network/network_state_notifier.cc',
78 'network/network_state_notifier.h', 91 'network/network_state_notifier.h',
79 'touch_exploration_controller.cc', 92 'touch_exploration_controller.cc',
80 'touch_exploration_controller.h', 93 'touch_exploration_controller.h',
81 'user_activity_power_manager_notifier.cc', 94 'user_activity_power_manager_notifier.cc',
82 'user_activity_power_manager_notifier.h', 95 'user_activity_power_manager_notifier.h',
83 ], 96 ],
84 }, 97 }, # target_name: ui_chromeos
85 ], 98 ],
86 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698