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

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

Issue 281353009: Reland Linux Window Control Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix another test Created 6 years, 7 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) 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 'layout/grid_layout.cc', 282 'layout/grid_layout.cc',
283 'layout/grid_layout.h', 283 'layout/grid_layout.h',
284 'layout/layout_constants.h', 284 'layout/layout_constants.h',
285 'layout/layout_manager.cc', 285 'layout/layout_manager.cc',
286 'layout/layout_manager.h', 286 'layout/layout_manager.h',
287 'linux_ui/linux_ui.h', 287 'linux_ui/linux_ui.h',
288 'linux_ui/linux_ui.cc', 288 'linux_ui/linux_ui.cc',
289 'linux_ui/status_icon_linux.h', 289 'linux_ui/status_icon_linux.h',
290 'linux_ui/status_icon_linux.cc', 290 'linux_ui/status_icon_linux.cc',
291 'linux_ui/window_button_order_observer.h', 291 'linux_ui/window_button_order_observer.h',
292 'linux_ui/window_button_order_provider.cc',
292 'metrics.cc', 293 'metrics.cc',
293 'metrics.h', 294 'metrics.h',
294 'metrics_aura.cc', 295 'metrics_aura.cc',
295 'metrics_mac.cc', 296 'metrics_mac.cc',
296 'mouse_constants.h', 297 'mouse_constants.h',
297 'mouse_watcher.h', 298 'mouse_watcher.h',
298 'mouse_watcher_aura.cc', 299 'mouse_watcher_aura.cc',
299 'mouse_watcher_view_host.cc', 300 'mouse_watcher_view_host.cc',
300 'mouse_watcher_view_host.h', 301 'mouse_watcher_view_host.h',
301 'native_cursor.h', 302 'native_cursor.h',
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 'window/dialog_client_view.h', 433 'window/dialog_client_view.h',
433 'window/dialog_delegate.cc', 434 'window/dialog_delegate.cc',
434 'window/dialog_delegate.h', 435 'window/dialog_delegate.h',
435 'window/frame_background.cc', 436 'window/frame_background.cc',
436 'window/frame_background.h', 437 'window/frame_background.h',
437 'window/frame_buttons.h', 438 'window/frame_buttons.h',
438 'window/native_frame_view.cc', 439 'window/native_frame_view.cc',
439 'window/native_frame_view.h', 440 'window/native_frame_view.h',
440 'window/non_client_view.cc', 441 'window/non_client_view.cc',
441 'window/non_client_view.h', 442 'window/non_client_view.h',
443 'window/window_button_order_provider.cc',
444 'window/window_button_order_provider.h',
442 'window/window_resources.h', 445 'window/window_resources.h',
443 'window/window_shape.cc', 446 'window/window_shape.cc',
444 'window/window_shape.h', 447 'window/window_shape.h',
445 ], 448 ],
446 'include_dirs': [ 449 'include_dirs': [
447 '../../third_party/wtl/include', 450 '../../third_party/wtl/include',
448 ], 451 ],
449 'conditions': [ 452 'conditions': [
450 ['chromeos==1', { 453 ['chromeos==1', {
451 'sources/': [ 454 'sources/': [
452 ['exclude', 'widget/desktop_aura'], 455 ['exclude', 'widget/desktop_aura'],
453 ], 456 ],
454 }], 457 }],
455 ['use_ash==0', { 458 ['use_ash==0', {
456 'sources!': [ 459 'sources!': [
457 'bubble/tray_bubble_view.cc', 460 'bubble/tray_bubble_view.cc',
458 'bubble/tray_bubble_view.h', 461 'bubble/tray_bubble_view.h',
459 ], 462 ],
460 }], 463 }],
461 ['chromeos==0 and use_x11==1', { 464 ['chromeos==0 and use_x11==1', {
462 'dependencies': [ 465 'dependencies': [
463 '../display/display.gyp:display_util', 466 '../display/display.gyp:display_util',
464 ], 467 ],
465 }], 468 }],
466 ['OS=="linux" and chromeos==0', { 469 ['OS=="linux" and chromeos==0', {
467 'dependencies': [ 470 'dependencies': [
468 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', 471 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
469 ], 472 ],
473 'sources!': [
474 'window/window_button_order_provider.cc',
475 ],
470 }, { # OS=="linux" and chromeos==0 476 }, { # OS=="linux" and chromeos==0
471 'sources/': [ 477 'sources/': [
472 ['exclude', 'linux_ui'], 478 ['exclude', 'linux_ui'],
473 ], 479 ],
474 }], 480 }],
475 ['OS=="win"', { 481 ['OS=="win"', {
476 'dependencies': [ 482 'dependencies': [
477 # For accessibility 483 # For accessibility
478 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 484 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
479 ], 485 ],
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 'view_unittest.cc', 667 'view_unittest.cc',
662 'widget/desktop_aura/desktop_focus_rules_unittest.cc', 668 'widget/desktop_aura/desktop_focus_rules_unittest.cc',
663 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', 669 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
664 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 670 'widget/desktop_aura/desktop_screen_x11_unittest.cc',
665 'widget/desktop_aura/desktop_screen_position_client_unittest.cc', 671 'widget/desktop_aura/desktop_screen_position_client_unittest.cc',
666 'widget/native_widget_aura_unittest.cc', 672 'widget/native_widget_aura_unittest.cc',
667 'widget/native_widget_unittest.cc', 673 'widget/native_widget_unittest.cc',
668 'widget/root_view_unittest.cc', 674 'widget/root_view_unittest.cc',
669 'widget/widget_unittest.cc', 675 'widget/widget_unittest.cc',
670 'widget/window_reorderer_unittest.cc', 676 'widget/window_reorderer_unittest.cc',
677 'window/custom_frame_view_unittest.cc',
671 'window/dialog_client_view_unittest.cc', 678 'window/dialog_client_view_unittest.cc',
672 'window/dialog_delegate_unittest.cc', 679 'window/dialog_delegate_unittest.cc',
673 ], 680 ],
674 'conditions': [ 681 'conditions': [
675 ['chromeos==0', { 682 ['chromeos==0', {
676 'sources!': [ 683 'sources!': [
677 'touchui/touch_selection_controller_impl_unittest.cc', 684 'touchui/touch_selection_controller_impl_unittest.cc',
678 ], 685 ],
679 }, { # use_chromeos==1 686 }, { # use_chromeos==1
680 'sources/': [ 687 'sources/': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 }], 729 }],
723 ['use_aura==1', { 730 ['use_aura==1', {
724 'dependencies': [ 731 'dependencies': [
725 '../aura/aura.gyp:aura_test_support', 732 '../aura/aura.gyp:aura_test_support',
726 ], 733 ],
727 }], 734 }],
728 ], 735 ],
729 }, # target_name: views_unittests 736 }, # target_name: views_unittests
730 ], 737 ],
731 } 738 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698