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

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, fix along with review comments 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
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_factory.cc ('k') | chrome/chrome_tests.gypi » ('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) 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 4005 matching lines...) Expand 10 before | Expand all | Expand 10 after
4016 }], 4016 }],
4017 ['touchui==0', { 4017 ['touchui==0', {
4018 'sources/': [ 4018 'sources/': [
4019 ['exclude', '^browser/chromeos/login/touch_*'], 4019 ['exclude', '^browser/chromeos/login/touch_*'],
4020 ['exclude', '^browser/extensions/extension_input_ui_api.cc'], 4020 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
4021 ['exclude', '^browser/extensions/extension_input_ui_api.h'], 4021 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
4022 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.cc'], 4022 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.cc'],
4023 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.h'], 4023 ['exclude', '^browser/renderer_host/accelerated_surface_container_to uch.h'],
4024 ['exclude', '^browser/renderer_host/render_widget_host_view_views_to uch.cc'], 4024 ['exclude', '^browser/renderer_host/render_widget_host_view_views_to uch.cc'],
4025 ['exclude', '^browser/ui/touch/*'], 4025 ['exclude', '^browser/ui/touch/*'],
4026 ['exclude', '^browser/ui/virtual_keyboard/*'],
4027 ['exclude', '^browser/ui/webui/keyboard_ui.*'],
4028 ], 4026 ],
4029 }], 4027 }],
4030 ['touchui==1', { 4028 ['touchui==1', {
4031 'dependencies': [ 4029 'dependencies': [
4032 '../ui/gfx/compositor/compositor.gyp:compositor', 4030 '../ui/gfx/compositor/compositor.gyp:compositor',
4033 '../ui/gfx/gl/gl.gyp:gl', 4031 '../ui/gfx/gl/gl.gyp:gl',
4034 ], 4032 ],
4035 'sources/': [ 4033 'sources/': [
4036 ['include', '^browser/ui/touch/*'], 4034 ['include', '^browser/ui/touch/*'],
4037 ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_f actory_chromeos.cc'], 4035 ['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
4117 ['exclude', '^browser/ui/views/task_manager_view.h'], 4115 ['exclude', '^browser/ui/views/task_manager_view.h'],
4118 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'], 4116 ['exclude', '^browser/ui/views/user_data_dir_dialog.cc'],
4119 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'], 4117 ['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
4120 ['include', '^browser/ui/views/simple_message_box_views.cc'], 4118 ['include', '^browser/ui/views/simple_message_box_views.cc'],
4121 ['include', '^browser/ui/views/simple_message_box_views.h'], 4119 ['include', '^browser/ui/views/simple_message_box_views.h'],
4122 ], 4120 ],
4123 'dependencies': [ 4121 'dependencies': [
4124 '../ui/aura/aura.gyp:aura', 4122 '../ui/aura/aura.gyp:aura',
4125 ], 4123 ],
4126 }], 4124 }],
4125 ['use_virtual_keyboard==0', {
4126 'sources/': [
4127 ['exclude', '^browser/ui/virtual_keyboard/*'],
4128 ['exclude', '^browser/ui/webui/keyboard_ui.*'],
4129 ],
4130 }],
4127 ['OS=="linux" and use_aura==1', { 4131 ['OS=="linux" and use_aura==1', {
4128 'dependencies': [ 4132 'dependencies': [
4129 '../build/linux/system.gyp:dbus', 4133 '../build/linux/system.gyp:dbus',
4130 '../build/linux/system.gyp:fontconfig', 4134 '../build/linux/system.gyp:fontconfig',
4131 '../build/linux/system.gyp:x11', 4135 '../build/linux/system.gyp:x11',
4132 '../dbus/dbus.gyp:dbus', 4136 '../dbus/dbus.gyp:dbus',
4133 ], 4137 ],
4134 }], 4138 }],
4135 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have 4139 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
4136 # native certificate viewers). 4140 # native certificate viewers).
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
5047 'type': 'static_library', 5051 'type': 'static_library',
5048 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5052 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5049 'variables': { 5053 'variables': {
5050 'proto_in_dir': 'browser/history', 5054 'proto_in_dir': 'browser/history',
5051 'proto_out_dir': 'chrome/browser/history', 5055 'proto_out_dir': 'chrome/browser/history',
5052 }, 5056 },
5053 'includes': [ '../build/protoc.gypi' ] 5057 'includes': [ '../build/protoc.gypi' ]
5054 }, 5058 },
5055 ], 5059 ],
5056 } 5060 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_factory.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698