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

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