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

Side by Side Diff: chrome/chrome_browser_extensions.gypi

Issue 1528483002: Add chrome.input.ime.activate and chrome.input.ime.deactivate API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Devlin and Shu's comments. Created 4 years, 11 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'chrome_browser_extensions_chromeos_sources': [ 7 'chrome_browser_extensions_chromeos_sources': [
8 'browser/extensions/api/cast_devices_private/cast_devices_private_api.cc', 8 'browser/extensions/api/cast_devices_private/cast_devices_private_api.cc',
9 'browser/extensions/api/cast_devices_private/cast_devices_private_api.h', 9 'browser/extensions/api/cast_devices_private/cast_devices_private_api.h',
10 'browser/extensions/api/certificate_provider/certificate_provider_api.cc', 10 'browser/extensions/api/certificate_provider/certificate_provider_api.cc',
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 'browser/extensions/api/storage/policy_value_store.cc', 942 'browser/extensions/api/storage/policy_value_store.cc',
943 'browser/extensions/api/storage/policy_value_store.h', 943 'browser/extensions/api/storage/policy_value_store.h',
944 ], 944 ],
945 'chrome_browser_extensions_input_ime_linux_win_sources': [ 945 'chrome_browser_extensions_input_ime_linux_win_sources': [
946 'browser/extensions/api/input_ime/input_ime_api.cc', 946 'browser/extensions/api/input_ime/input_ime_api.cc',
947 'browser/extensions/api/input_ime/input_ime_api.h', 947 'browser/extensions/api/input_ime/input_ime_api.h',
948 'browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc', 948 'browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc',
949 'browser/extensions/api/input_ime/input_ime_api_nonchromeos.h', 949 'browser/extensions/api/input_ime/input_ime_api_nonchromeos.h',
950 'browser/extensions/api/input_ime/input_ime_event_router_base.cc', 950 'browser/extensions/api/input_ime/input_ime_event_router_base.cc',
951 'browser/extensions/api/input_ime/input_ime_event_router_base.h', 951 'browser/extensions/api/input_ime/input_ime_event_router_base.h',
952 'browser/input_method/input_method_engine.cc',
Ken Rockot(use gerrit already) 2016/01/19 04:06:49 This is not the right place for these source files
Azure Wei 2016/01/19 05:24:58 I think chrome_browser_chromeos_sources is for Chr
953 'browser/input_method/input_method_engine.h',
954 'browser/input_method/input_method_engine_base.cc',
955 'browser/input_method/input_method_engine_base.h',
952 ], 956 ],
953 }, 957 },
954 # ---------------------------------------------------------------------------- 958 # ----------------------------------------------------------------------------
955 # Note on GN build: everything below here is duplicated in 959 # Note on GN build: everything below here is duplicated in
956 # chrome/browser/BUILD.gn. If you change anything, you will also have to 960 # chrome/browser/BUILD.gn. If you change anything, you will also have to
957 # update that file. Some short and probably rarely-changing file lists are 961 # update that file. Some short and probably rarely-changing file lists are
958 # duplicated between the builds. If a list gets longer or is changed it is 962 # duplicated between the builds. If a list gets longer or is changed it is
959 # probably worth sharing. 963 # probably worth sharing.
960 'targets': [ 964 'targets': [
961 { 965 {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 'dependencies': [ 1093 'dependencies': [
1090 '../build/linux/system.gyp:x11', 1094 '../build/linux/system.gyp:x11',
1091 '../ui/events/platform/events_platform.gyp:events_platform', 1095 '../ui/events/platform/events_platform.gyp:events_platform',
1092 '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_pl atform', 1096 '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_pl atform',
1093 ], 1097 ],
1094 }], 1098 }],
1095 ['chromeos==0', { 1099 ['chromeos==0', {
1096 'sources': [ 1100 'sources': [
1097 '<@(chrome_browser_extensions_input_ime_linux_win_sources)', 1101 '<@(chrome_browser_extensions_input_ime_linux_win_sources)',
1098 ], 1102 ],
1103 'dependencies': [
1104 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
1105 '../ui/events/events.gyp:dom_keycode_converter',
1106 ],
1099 }], 1107 }],
1100 ], 1108 ],
1101 }], 1109 }],
1102 ['configuration_policy==1', { 1110 ['configuration_policy==1', {
1103 'dependencies': [ 1111 'dependencies': [
1104 '../components/components.gyp:policy', 1112 '../components/components.gyp:policy',
1105 ], 1113 ],
1106 'sources': [ 1114 'sources': [
1107 'browser/extensions/policy_handlers.cc', 1115 'browser/extensions/policy_handlers.cc',
1108 'browser/extensions/policy_handlers.h', 1116 'browser/extensions/policy_handlers.h',
1109 '<@(chrome_browser_extensions_policy_sources)', 1117 '<@(chrome_browser_extensions_policy_sources)',
1110 ], 1118 ],
1111 }], 1119 }],
1112 ['OS=="win" or OS=="mac"', { 1120 ['OS=="win" or OS=="mac"', {
1113 'dependencies': [ 1121 'dependencies': [
1114 '../components/components.gyp:wifi_component', 1122 '../components/components.gyp:wifi_component',
1115 ], 1123 ],
1116 'sources': [ 1124 'sources': [
1117 '<@(chrome_browser_extensions_networking_private_sources_winmac)', 1125 '<@(chrome_browser_extensions_networking_private_sources_winmac)',
1118 ], 1126 ],
1119 }], 1127 }],
1120 ['OS=="win"', { 1128 ['OS=="win"', {
1121 'dependencies': [ 1129 'dependencies': [
1122 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 1130 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
1123 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 1131 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
1132 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
1133 '../ui/events/events.gyp:dom_keycode_converter',
1124 ], 1134 ],
1125 'sources': [ 1135 'sources': [
1126 '<@(chrome_browser_extensions_input_ime_linux_win_sources)', 1136 '<@(chrome_browser_extensions_input_ime_linux_win_sources)',
1127 ], 1137 ],
1128 }, { # 'OS!="win" 1138 }, { # 'OS!="win"
1129 'conditions': [ 1139 'conditions': [
1130 ['OS=="linux" and toolkit_views==1',{ 1140 ['OS=="linux" and toolkit_views==1',{
1131 'include_dirs': [ 1141 'include_dirs': [
1132 '<(INTERMEDIATE_DIR)', 1142 '<(INTERMEDIATE_DIR)',
1133 '<(INTERMEDIATE_DIR)/chrome', 1143 '<(INTERMEDIATE_DIR)/chrome',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 ], 1184 ],
1175 }, { # use_brlapi==0 1185 }, { # use_brlapi==0
1176 'sources': [ 1186 'sources': [
1177 'browser/extensions/api/braille_display_private/braille_controller_s tub.cc', 1187 'browser/extensions/api/braille_display_private/braille_controller_s tub.cc',
1178 ], 1188 ],
1179 }], 1189 }],
1180 ], 1190 ],
1181 }, 1191 },
1182 ], 1192 ],
1183 } 1193 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698