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

Side by Side Diff: ui/views/views.gyp

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'ime/mock_input_method.h', 306 'ime/mock_input_method.h',
307 'layout/box_layout.cc', 307 'layout/box_layout.cc',
308 'layout/box_layout.h', 308 'layout/box_layout.h',
309 'layout/fill_layout.cc', 309 'layout/fill_layout.cc',
310 'layout/fill_layout.h', 310 'layout/fill_layout.h',
311 'layout/grid_layout.cc', 311 'layout/grid_layout.cc',
312 'layout/grid_layout.h', 312 'layout/grid_layout.h',
313 'layout/layout_constants.h', 313 'layout/layout_constants.h',
314 'layout/layout_manager.cc', 314 'layout/layout_manager.cc',
315 'layout/layout_manager.h', 315 'layout/layout_manager.h',
316 'linux_ui/linux_ui.h',
317 'linux_ui/linux_ui.cc',
318 'linux_ui/status_icon_linux.h',
319 'linux_ui/status_icon_linux.cc',
316 'metrics.cc', 320 'metrics.cc',
317 'metrics.h', 321 'metrics.h',
318 'metrics_aura.cc', 322 'metrics_aura.cc',
319 'metrics_win.cc', 323 'metrics_win.cc',
320 'mouse_constants.cc', 324 'mouse_constants.cc',
321 'mouse_constants.h', 325 'mouse_constants.h',
322 'mouse_watcher.cc', 326 'mouse_watcher.cc',
323 'mouse_watcher.h', 327 'mouse_watcher.h',
324 'mouse_watcher_view_host.cc', 328 'mouse_watcher_view_host.cc',
325 'mouse_watcher_view_host.h', 329 'mouse_watcher_view_host.h',
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 ], 545 ],
542 }], 546 }],
543 ['use_aura==1 and OS=="win"', { 547 ['use_aura==1 and OS=="win"', {
544 'sources/': [ 548 'sources/': [
545 ['include', 'controls/menu/menu_config_win.cc'], 549 ['include', 'controls/menu/menu_config_win.cc'],
546 ['include', 'controls/menu/menu_separator_win.cc'], 550 ['include', 'controls/menu/menu_separator_win.cc'],
547 ['include', 'accessibility/native_view_accessibility_win.cc'], 551 ['include', 'accessibility/native_view_accessibility_win.cc'],
548 ['include', 'accessibility/native_view_accessibility_win.h'], 552 ['include', 'accessibility/native_view_accessibility_win.h'],
549 ], 553 ],
550 }], 554 }],
551 ['use_aura==1 and OS=="linux" and chromeos==0', { 555 ['OS=="linux" and chromeos==0', {
552 'dependencies': [ 556 'dependencies': [
553 '../ui.gyp:shell_dialogs', 557 '../ui.gyp:shell_dialogs',
554 '../linux_ui/linux_ui.gyp:linux_ui', 558 ],
559 }, { # OS=="linux" and chromeos==0
560 'sources/': [
561 ['exclude', 'linux_ui'],
555 ], 562 ],
556 }], 563 }],
557 ['OS=="win"', { 564 ['OS=="win"', {
558 'dependencies': [ 565 'dependencies': [
559 # For accessibility 566 # For accessibility
560 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 567 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
561 ], 568 ],
562 'include_dirs': [ 569 'include_dirs': [
563 '../../third_party/wtl/include', 570 '../../third_party/wtl/include',
564 ], 571 ],
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 'sources/': [ 1066 'sources/': [
1060 # This is needed because the aura rule strips it from the default 1067 # This is needed because the aura rule strips it from the default
1061 # sources list. 1068 # sources list.
1062 ['include', '^../../content/app/startup_helper_win.cc'], 1069 ['include', '^../../content/app/startup_helper_win.cc'],
1063 ], 1070 ],
1064 }], 1071 }],
1065 ], 1072 ],
1066 }, # target_name: views_examples_with_content_exe 1073 }, # target_name: views_examples_with_content_exe
1067 ], 1074 ],
1068 } 1075 }
OLDNEW
« no previous file with comments | « ui/views/linux_ui/status_icon_linux.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698