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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 10824023: Revert "Revert 148383 - Move the keyboard overlay view to ash." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/keyboard_overlay_dialog_view.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 3694 matching lines...) Expand 10 before | Expand all | Expand 10 after
3705 'browser/ui/views/infobars/link_infobar.cc', 3705 'browser/ui/views/infobars/link_infobar.cc',
3706 'browser/ui/views/infobars/link_infobar.h', 3706 'browser/ui/views/infobars/link_infobar.h',
3707 'browser/ui/views/infobars/media_stream_infobar.cc', 3707 'browser/ui/views/infobars/media_stream_infobar.cc',
3708 'browser/ui/views/infobars/media_stream_infobar.h', 3708 'browser/ui/views/infobars/media_stream_infobar.h',
3709 'browser/ui/views/infobars/translate_infobar_base.cc', 3709 'browser/ui/views/infobars/translate_infobar_base.cc',
3710 'browser/ui/views/infobars/translate_infobar_base.h', 3710 'browser/ui/views/infobars/translate_infobar_base.h',
3711 'browser/ui/views/infobars/translate_message_infobar.cc', 3711 'browser/ui/views/infobars/translate_message_infobar.cc',
3712 'browser/ui/views/infobars/translate_message_infobar.h', 3712 'browser/ui/views/infobars/translate_message_infobar.h',
3713 'browser/ui/views/javascript_app_modal_dialog_views.cc', 3713 'browser/ui/views/javascript_app_modal_dialog_views.cc',
3714 'browser/ui/views/javascript_app_modal_dialog_views.h', 3714 'browser/ui/views/javascript_app_modal_dialog_views.h',
3715 'browser/ui/views/keyboard_overlay_delegate.cc',
3716 'browser/ui/views/keyboard_overlay_delegate.h',
3717 'browser/ui/views/keyboard_overlay_dialog_view.cc',
3718 'browser/ui/views/keyboard_overlay_dialog_view.h',
3719 'browser/ui/views/location_bar/action_box_button_view.cc', 3715 'browser/ui/views/location_bar/action_box_button_view.cc',
3720 'browser/ui/views/location_bar/action_box_button_view.h', 3716 'browser/ui/views/location_bar/action_box_button_view.h',
3721 'browser/ui/views/location_bar/chrome_to_mobile_view.cc', 3717 'browser/ui/views/location_bar/chrome_to_mobile_view.cc',
3722 'browser/ui/views/location_bar/chrome_to_mobile_view.h', 3718 'browser/ui/views/location_bar/chrome_to_mobile_view.h',
3723 'browser/ui/views/location_bar/content_setting_image_view.cc', 3719 'browser/ui/views/location_bar/content_setting_image_view.cc',
3724 'browser/ui/views/location_bar/content_setting_image_view.h', 3720 'browser/ui/views/location_bar/content_setting_image_view.h',
3725 'browser/ui/views/location_bar/ev_bubble_view.cc', 3721 'browser/ui/views/location_bar/ev_bubble_view.cc',
3726 'browser/ui/views/location_bar/ev_bubble_view.h', 3722 'browser/ui/views/location_bar/ev_bubble_view.h',
3727 'browser/ui/views/location_bar/icon_label_bubble_view.cc', 3723 'browser/ui/views/location_bar/icon_label_bubble_view.cc',
3728 'browser/ui/views/location_bar/icon_label_bubble_view.h', 3724 'browser/ui/views/location_bar/icon_label_bubble_view.h',
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
5160 'sources!': [ 5156 'sources!': [
5161 'browser/history/history_publisher_none.cc', 5157 'browser/history/history_publisher_none.cc',
5162 'browser/importer/nss_decryptor_system_nss.cc', 5158 'browser/importer/nss_decryptor_system_nss.cc',
5163 'browser/importer/nss_decryptor_system_nss.h', 5159 'browser/importer/nss_decryptor_system_nss.h',
5164 'browser/lifetime/application_lifetime_stub.cc', 5160 'browser/lifetime/application_lifetime_stub.cc',
5165 'browser/ui/certificate_dialogs.cc', 5161 'browser/ui/certificate_dialogs.cc',
5166 'browser/ui/certificate_dialogs.h', 5162 'browser/ui/certificate_dialogs.h',
5167 'browser/ui/crypto_module_password_dialog.cc', 5163 'browser/ui/crypto_module_password_dialog.cc',
5168 'browser/ui/crypto_module_password_dialog_nss.cc', 5164 'browser/ui/crypto_module_password_dialog_nss.cc',
5169 'browser/ui/startup/autolaunch_prompt.cc', 5165 'browser/ui/startup/autolaunch_prompt.cc',
5170 'browser/ui/views/keyboard_overlay_delegate.cc',
5171 'browser/ui/views/keyboard_overlay_dialog_view.cc',
5172 'browser/ui/views/simple_message_box_views.cc', 5166 'browser/ui/views/simple_message_box_views.cc',
5173 'browser/ui/webui/help/version_updater_basic.cc', 5167 'browser/ui/webui/help/version_updater_basic.cc',
5174 'browser/ui/webui/help/version_updater_basic.h', 5168 'browser/ui/webui/help/version_updater_basic.h',
5175 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc', 5169 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc',
5176 'browser/ui/webui/tab_modal_confirm_dialog_webui.h', 5170 'browser/ui/webui/tab_modal_confirm_dialog_webui.h',
5177 ], 5171 ],
5178 'conditions': [ 5172 'conditions': [
5179 ['win_use_allocator_shim==1', { 5173 ['win_use_allocator_shim==1', {
5180 'dependencies': [ 5174 'dependencies': [
5181 '<(allocator_target)', 5175 '<(allocator_target)',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
5238 ['exclude', '^browser/ui/views/'], 5232 ['exclude', '^browser/ui/views/'],
5239 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc '], 5233 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc '],
5240 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h' ] 5234 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h' ]
5241 ] 5235 ]
5242 }], 5236 }],
5243 # Build Aura on desktop linux 5237 # Build Aura on desktop linux
5244 ['OS=="linux" and use_aura==1 and chromeos==0', { 5238 ['OS=="linux" and use_aura==1 and chromeos==0', {
5245 'sources/': [ 5239 'sources/': [
5246 ['exclude', '^browser/chromeos/extensions/file_browser_handler_a pi'], 5240 ['exclude', '^browser/chromeos/extensions/file_browser_handler_a pi'],
5247 ['exclude', '^browser/chromeos/extensions/file_browser_private_a pi'], 5241 ['exclude', '^browser/chromeos/extensions/file_browser_private_a pi'],
5248 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
5249 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
5250 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'] ,
5251 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
5252 ], 5242 ],
5253 }], 5243 }],
5254 # GTK build only 5244 # GTK build only
5255 ['toolkit_uses_gtk==1', { 5245 ['toolkit_uses_gtk==1', {
5256 'sources/': [ 5246 'sources/': [
5257 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], 5247 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
5258 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 5248 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
5259 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'], 5249 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
5260 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'], 5250 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
5261 ['exclude', '^browser/ui/panels/panel_browser_view.cc'], 5251 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
5466 'variables': { 5456 'variables': {
5467 'jni_gen_dir': 'chrome', 5457 'jni_gen_dir': 'chrome',
5468 }, 5458 },
5469 'includes': [ '../build/jni_generator.gypi' ], 5459 'includes': [ '../build/jni_generator.gypi' ],
5470 }, 5460 },
5471 ], 5461 ],
5472 }, 5462 },
5473 ], 5463 ],
5474 ], 5464 ],
5475 } 5465 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/keyboard_overlay_dialog_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698