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

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

Issue 294473016: Revert 272352 "Reland Linux Window Control Alignment" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 'layout/grid_layout.cc', 291 'layout/grid_layout.cc',
292 'layout/grid_layout.h', 292 'layout/grid_layout.h',
293 'layout/layout_constants.h', 293 'layout/layout_constants.h',
294 'layout/layout_manager.cc', 294 'layout/layout_manager.cc',
295 'layout/layout_manager.h', 295 'layout/layout_manager.h',
296 'linux_ui/linux_ui.h', 296 'linux_ui/linux_ui.h',
297 'linux_ui/linux_ui.cc', 297 'linux_ui/linux_ui.cc',
298 'linux_ui/status_icon_linux.h', 298 'linux_ui/status_icon_linux.h',
299 'linux_ui/status_icon_linux.cc', 299 'linux_ui/status_icon_linux.cc',
300 'linux_ui/window_button_order_observer.h', 300 'linux_ui/window_button_order_observer.h',
301 'linux_ui/window_button_order_provider.cc',
302 'metrics.cc', 301 'metrics.cc',
303 'metrics.h', 302 'metrics.h',
304 'metrics_aura.cc', 303 'metrics_aura.cc',
305 'metrics_mac.cc', 304 'metrics_mac.cc',
306 'mouse_constants.h', 305 'mouse_constants.h',
307 'mouse_watcher.h', 306 'mouse_watcher.h',
308 'mouse_watcher_aura.cc', 307 'mouse_watcher_aura.cc',
309 'mouse_watcher_view_host.cc', 308 'mouse_watcher_view_host.cc',
310 'mouse_watcher_view_host.h', 309 'mouse_watcher_view_host.h',
311 'native_cursor.h', 310 'native_cursor.h',
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 'window/dialog_client_view.h', 441 'window/dialog_client_view.h',
443 'window/dialog_delegate.cc', 442 'window/dialog_delegate.cc',
444 'window/dialog_delegate.h', 443 'window/dialog_delegate.h',
445 'window/frame_background.cc', 444 'window/frame_background.cc',
446 'window/frame_background.h', 445 'window/frame_background.h',
447 'window/frame_buttons.h', 446 'window/frame_buttons.h',
448 'window/native_frame_view.cc', 447 'window/native_frame_view.cc',
449 'window/native_frame_view.h', 448 'window/native_frame_view.h',
450 'window/non_client_view.cc', 449 'window/non_client_view.cc',
451 'window/non_client_view.h', 450 'window/non_client_view.h',
452 'window/window_button_order_provider.cc',
453 'window/window_button_order_provider.h',
454 'window/window_resources.h', 451 'window/window_resources.h',
455 'window/window_shape.cc', 452 'window/window_shape.cc',
456 'window/window_shape.h', 453 'window/window_shape.h',
457 ], 454 ],
458 'include_dirs': [ 455 'include_dirs': [
459 '../../third_party/wtl/include', 456 '../../third_party/wtl/include',
460 ], 457 ],
461 'conditions': [ 458 'conditions': [
462 ['chromeos==1', { 459 ['chromeos==1', {
463 'sources/': [ 460 'sources/': [
464 ['exclude', 'widget/desktop_aura'], 461 ['exclude', 'widget/desktop_aura'],
465 ], 462 ],
466 }], 463 }],
467 ['use_ash==0', { 464 ['use_ash==0', {
468 'sources!': [ 465 'sources!': [
469 'bubble/tray_bubble_view.cc', 466 'bubble/tray_bubble_view.cc',
470 'bubble/tray_bubble_view.h', 467 'bubble/tray_bubble_view.h',
471 ], 468 ],
472 }], 469 }],
473 ['chromeos==0 and use_x11==1', { 470 ['chromeos==0 and use_x11==1', {
474 'dependencies': [ 471 'dependencies': [
475 '../display/display.gyp:display_util', 472 '../display/display.gyp:display_util',
476 ], 473 ],
477 }], 474 }],
478 ['OS=="linux" and chromeos==0', { 475 ['OS=="linux" and chromeos==0', {
479 'dependencies': [ 476 'dependencies': [
480 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', 477 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
481 ], 478 ],
482 'sources!': [
483 'window/window_button_order_provider.cc',
484 ],
485 }, { # OS=="linux" and chromeos==0 479 }, { # OS=="linux" and chromeos==0
486 'sources/': [ 480 'sources/': [
487 ['exclude', 'linux_ui'], 481 ['exclude', 'linux_ui'],
488 ], 482 ],
489 }], 483 }],
490 ['OS=="win"', { 484 ['OS=="win"', {
491 'dependencies': [ 485 'dependencies': [
492 # For accessibility 486 # For accessibility
493 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 487 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
494 ], 488 ],
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 'widget/desktop_aura/desktop_focus_rules_unittest.cc', 680 'widget/desktop_aura/desktop_focus_rules_unittest.cc',
687 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', 681 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
688 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 682 'widget/desktop_aura/desktop_screen_x11_unittest.cc',
689 'widget/desktop_aura/desktop_screen_position_client_unittest.cc', 683 'widget/desktop_aura/desktop_screen_position_client_unittest.cc',
690 'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc', 684 'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc',
691 'widget/native_widget_aura_unittest.cc', 685 'widget/native_widget_aura_unittest.cc',
692 'widget/native_widget_unittest.cc', 686 'widget/native_widget_unittest.cc',
693 'widget/root_view_unittest.cc', 687 'widget/root_view_unittest.cc',
694 'widget/widget_unittest.cc', 688 'widget/widget_unittest.cc',
695 'widget/window_reorderer_unittest.cc', 689 'widget/window_reorderer_unittest.cc',
696 'window/custom_frame_view_unittest.cc',
697 'window/dialog_client_view_unittest.cc', 690 'window/dialog_client_view_unittest.cc',
698 'window/dialog_delegate_unittest.cc', 691 'window/dialog_delegate_unittest.cc',
699 ], 692 ],
700 'conditions': [ 693 'conditions': [
701 ['chromeos==0', { 694 ['chromeos==0', {
702 'sources!': [ 695 'sources!': [
703 'touchui/touch_selection_controller_impl_unittest.cc', 696 'touchui/touch_selection_controller_impl_unittest.cc',
704 ], 697 ],
705 }, { # use_chromeos==1 698 }, { # use_chromeos==1
706 'sources/': [ 699 'sources/': [
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 }], 752 }],
760 ['use_x11==1', { 753 ['use_x11==1', {
761 'dependencies': [ 754 'dependencies': [
762 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' , 755 '../events/platform/x11/x11_events_platform.gyp:x11_events_platform' ,
763 ], 756 ],
764 }], 757 }],
765 ], 758 ],
766 }, # target_name: views_unittests 759 }, # target_name: views_unittests
767 ], 760 ],
768 } 761 }
OLDNEW
« no previous file with comments | « trunk/src/ui/views/linux_ui/window_button_order_provider.cc ('k') | trunk/src/ui/views/window/custom_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698