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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased on ToT, modified resources/options/language_options.html Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 4004 matching lines...) Expand 10 before | Expand all | Expand 10 after
4015 }], 4015 }],
4016 ['touchui==0', { 4016 ['touchui==0', {
4017 'sources/': [ 4017 'sources/': [
4018 ['exclude', '^browser/chromeos/login/touch_*'], 4018 ['exclude', '^browser/chromeos/login/touch_*'],
4019 ['exclude', '^browser/extensions/extension_input_ui_api.cc'], 4019 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
4020 ['exclude', '^browser/extensions/extension_input_ui_api.h'], 4020 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
4021 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.cc'], 4021 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.cc'],
4022 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.h'], 4022 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.h'],
4023 ['exclude', '^browser/renderer_host/render_widget_host_view_views_to uch.cc'], 4023 ['exclude', '^browser/renderer_host/render_widget_host_view_views_to uch.cc'],
4024 ['exclude', '^browser/ui/touch/*'], 4024 ['exclude', '^browser/ui/touch/*'],
4025 ['exclude', '^browser/ui/virtual_keyboard/*'],
4026 ['exclude', '^browser/ui/webui/keyboard_ui.*'],
4027 ], 4025 ],
4028 }], 4026 }],
4029 ['touchui==1', { 4027 ['touchui==1', {
4030 'dependencies': [ 4028 'dependencies': [
4031 '../ui/gfx/compositor/compositor.gyp:compositor', 4029 '../ui/gfx/compositor/compositor.gyp:compositor',
4032 '../ui/gfx/gl/gl.gyp:gl', 4030 '../ui/gfx/gl/gl.gyp:gl',
4033 ], 4031 ],
4034 'sources/': [ 4032 'sources/': [
4035 ['include', '^browser/ui/touch/*'], 4033 ['include', '^browser/ui/touch/*'],
4036 ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_f actory_chromeos.cc'], 4034 ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_f actory_chromeos.cc'],
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
4116 ['exclude', '^browser/ui/views/task_manager_view.h'], 4114 ['exclude', '^browser/ui/views/task_manager_view.h'],
4117 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'], 4115 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
4118 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'], 4116 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
4119 ['include', '^browser/ui/views/simple_message_box_views.cc'], 4117 ['include', '^browser/ui/views/simple_message_box_views.cc'],
4120 ['include', '^browser/ui/views/simple_message_box_views.h'], 4118 ['include', '^browser/ui/views/simple_message_box_views.h'],
4121 ], 4119 ],
4122 'dependencies': [ 4120 'dependencies': [
4123 '../ui/aura/aura.gyp:aura', 4121 '../ui/aura/aura.gyp:aura',
4124 ], 4122 ],
4125 }], 4123 }],
4124 ['use_virtual_keyboard==0', {
4125 'sources/': [
4126 ['exclude', '^browser/ui/virtual_keyboard/*'],
4127 ['exclude', '^browser/ui/webui/keyboard_ui.*'],
4128 ],
4129 }],
4126 ['OS=="linux" and use_aura==1', { 4130 ['OS=="linux" and use_aura==1', {
4127 'dependencies': [ 4131 'dependencies': [
4128 '../build/linux/system.gyp:dbus', 4132 '../build/linux/system.gyp:dbus',
4129 '../build/linux/system.gyp:fontconfig', 4133 '../build/linux/system.gyp:fontconfig',
4130 '../build/linux/system.gyp:x11', 4134 '../build/linux/system.gyp:x11',
4131 '../dbus/dbus.gyp:dbus', 4135 '../dbus/dbus.gyp:dbus',
4132 ], 4136 ],
4133 }], 4137 }],
4134 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have 4138 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
4135 # native certificate viewers). 4139 # native certificate viewers).
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
5046 'type': 'static_library', 5050 'type': 'static_library',
5047 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5051 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5048 'variables': { 5052 'variables': {
5049 'proto_in_dir': 'browser/history', 5053 'proto_in_dir': 'browser/history',
5050 'proto_out_dir': 'chrome/browser/history', 5054 'proto_out_dir': 'chrome/browser/history',
5051 }, 5055 },
5052 'includes': [ '../build/protoc.gypi' ] 5056 'includes': [ '../build/protoc.gypi' ]
5053 }, 5057 },
5054 ], 5058 ],
5055 } 5059 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698