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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ui/chromeos/ui_chromeos.gyp
diff --git a/ui/chromeos/ui_chromeos.gyp b/ui/chromeos/ui_chromeos.gyp
index 1eeec050491294ae3716c4de487b7cb98f321913..dd3ae803e5cfbb3cd1908c3c7b62a62f32020ca6 100644
--- a/ui/chromeos/ui_chromeos.gyp
+++ b/ui/chromeos/ui_chromeos.gyp
@@ -23,7 +23,7 @@
},
],
'includes': [ '../../build/grit_target.gypi' ],
- },
+ }, # target_name: ui_chromeos_resources
{
'target_name': 'ui_chromeos_strings',
'type': 'none',
@@ -40,12 +40,13 @@
},
],
'includes': [ '../../build/grit_target.gypi' ],
- },
+ }, # target_name: ui_chromeos_strings
{
'target_name': 'ui_chromeos',
'type': '<(component)',
'dependencies': [
'../../base/base.gyp:base',
+ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../chromeos/chromeos.gyp:power_manager_proto',
'../../skia/skia.gyp:skia',
'../aura/aura.gyp:aura',
@@ -62,6 +63,18 @@
],
'sources': [
'accessibility_types.h',
+ 'ime/candidate_view.cc',
+ 'ime/candidate_view.h',
+ 'ime/candidate_window_view.cc',
+ 'ime/candidate_window_view.h',
+ 'ime/infolist_window.cc',
+ 'ime/infolist_window.h',
+ 'ime/input_method_menu_item.cc',
+ 'ime/input_method_menu_item.h',
+ 'ime/input_method_menu_manager.cc',
+ 'ime/input_method_menu_manager.h',
+ 'ime/mode_indicator_view.cc',
+ 'ime/mode_indicator_view.h',
'network/network_connect.cc',
'network/network_connect.h',
'network/network_icon.cc',
@@ -81,6 +94,6 @@
'user_activity_power_manager_notifier.cc',
'user_activity_power_manager_notifier.h',
],
- },
+ }, # target_name: ui_chromeos
],
}

Powered by Google App Engine
This is Rietveld 408576698