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

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

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

Powered by Google App Engine
This is Rietveld 408576698