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

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

Issue 276173002: Revert of Linux Aura Task Manager Frame Buttons Misaligned (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« 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 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'views', 10 'target_name': 'views',
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 'layout/grid_layout.h', 264 'layout/grid_layout.h',
265 'layout/layout_constants.h', 265 'layout/layout_constants.h',
266 'layout/layout_manager.cc', 266 'layout/layout_manager.cc',
267 'layout/layout_manager.h', 267 'layout/layout_manager.h',
268 'linux_ui/linux_ui.h', 268 'linux_ui/linux_ui.h',
269 'linux_ui/linux_ui.cc', 269 'linux_ui/linux_ui.cc',
270 'linux_ui/native_theme_change_observer.h', 270 'linux_ui/native_theme_change_observer.h',
271 'linux_ui/status_icon_linux.h', 271 'linux_ui/status_icon_linux.h',
272 'linux_ui/status_icon_linux.cc', 272 'linux_ui/status_icon_linux.cc',
273 'linux_ui/window_button_order_observer.h', 273 'linux_ui/window_button_order_observer.h',
274 'linux_ui/window_button_order_provider.cc',
275 'metrics.cc', 274 'metrics.cc',
276 'metrics.h', 275 'metrics.h',
277 'metrics_aura.cc', 276 'metrics_aura.cc',
278 'mouse_constants.h', 277 'mouse_constants.h',
279 'mouse_watcher.cc', 278 'mouse_watcher.cc',
280 'mouse_watcher.h', 279 'mouse_watcher.h',
281 'mouse_watcher_view_host.cc', 280 'mouse_watcher_view_host.cc',
282 'mouse_watcher_view_host.h', 281 'mouse_watcher_view_host.h',
283 'native_theme_delegate.h', 282 'native_theme_delegate.h',
284 'painter.cc', 283 'painter.cc',
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 'window/dialog_client_view.h', 408 'window/dialog_client_view.h',
410 'window/dialog_delegate.cc', 409 'window/dialog_delegate.cc',
411 'window/dialog_delegate.h', 410 'window/dialog_delegate.h',
412 'window/frame_background.cc', 411 'window/frame_background.cc',
413 'window/frame_background.h', 412 'window/frame_background.h',
414 'window/frame_buttons.h', 413 'window/frame_buttons.h',
415 'window/native_frame_view.cc', 414 'window/native_frame_view.cc',
416 'window/native_frame_view.h', 415 'window/native_frame_view.h',
417 'window/non_client_view.cc', 416 'window/non_client_view.cc',
418 'window/non_client_view.h', 417 'window/non_client_view.h',
419 'window/window_button_order_provider.cc',
420 'window/window_button_order_provider.h',
421 'window/window_resources.h', 418 'window/window_resources.h',
422 'window/window_shape.cc', 419 'window/window_shape.cc',
423 'window/window_shape.h', 420 'window/window_shape.h',
424 ], 421 ],
425 'include_dirs': [ 422 'include_dirs': [
426 '../../third_party/wtl/include', 423 '../../third_party/wtl/include',
427 ], 424 ],
428 'conditions': [ 425 'conditions': [
429 ['chromeos==1', { 426 ['chromeos==1', {
430 'sources/': [ 427 'sources/': [
431 ['exclude', 'widget/desktop_aura'], 428 ['exclude', 'widget/desktop_aura'],
432 ], 429 ],
433 }], 430 }],
434 ['use_ash==0', { 431 ['use_ash==0', {
435 'sources!': [ 432 'sources!': [
436 'bubble/tray_bubble_view.cc', 433 'bubble/tray_bubble_view.cc',
437 'bubble/tray_bubble_view.h', 434 'bubble/tray_bubble_view.h',
438 ], 435 ],
439 }], 436 }],
440 ['chromeos==0 and use_x11==1', { 437 ['chromeos==0 and use_x11==1', {
441 'dependencies': [ 438 'dependencies': [
442 '../display/display.gyp:display_util', 439 '../display/display.gyp:display_util',
443 ], 440 ],
444 }], 441 }],
445 ['OS=="linux" and chromeos==0', { 442 ['OS=="linux" and chromeos==0', {
446 'dependencies': [ 443 'dependencies': [
447 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', 444 '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
448 ], 445 ],
449 'sources!': [
450 'window/window_button_order_provider.cc',
451 ],
452 }, { # OS=="linux" and chromeos==0 446 }, { # OS=="linux" and chromeos==0
453 'sources/': [ 447 'sources/': [
454 ['exclude', 'linux_ui'], 448 ['exclude', 'linux_ui'],
455 ], 449 ],
456 }], 450 }],
457 ['OS=="win"', { 451 ['OS=="win"', {
458 'dependencies': [ 452 'dependencies': [
459 # For accessibility 453 # For accessibility
460 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 454 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
461 ], 455 ],
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 'widget/desktop_aura/desktop_focus_rules_unittest.cc', 638 'widget/desktop_aura/desktop_focus_rules_unittest.cc',
645 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', 639 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
646 'widget/desktop_aura/desktop_window_tree_host_win_unittest.cc', 640 'widget/desktop_aura/desktop_window_tree_host_win_unittest.cc',
647 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 641 'widget/desktop_aura/desktop_screen_x11_unittest.cc',
648 'widget/desktop_aura/desktop_screen_position_client_unittest.cc', 642 'widget/desktop_aura/desktop_screen_position_client_unittest.cc',
649 'widget/native_widget_aura_unittest.cc', 643 'widget/native_widget_aura_unittest.cc',
650 'widget/native_widget_unittest.cc', 644 'widget/native_widget_unittest.cc',
651 'widget/root_view_unittest.cc', 645 'widget/root_view_unittest.cc',
652 'widget/widget_unittest.cc', 646 'widget/widget_unittest.cc',
653 'widget/window_reorderer_unittest.cc', 647 'widget/window_reorderer_unittest.cc',
654 'window/custom_frame_view_unittest.cc',
655 'window/dialog_client_view_unittest.cc', 648 'window/dialog_client_view_unittest.cc',
656 'window/dialog_delegate_unittest.cc', 649 'window/dialog_delegate_unittest.cc',
657 ], 650 ],
658 'conditions': [ 651 'conditions': [
659 ['chromeos==0', { 652 ['chromeos==0', {
660 'sources!': [ 653 'sources!': [
661 'touchui/touch_selection_controller_impl_unittest.cc', 654 'touchui/touch_selection_controller_impl_unittest.cc',
662 ], 655 ],
663 }, { # use_chromeos==1 656 }, { # use_chromeos==1
664 'sources/': [ 657 'sources/': [
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 }], 692 }],
700 ['use_ozone==1', { 693 ['use_ozone==1', {
701 'sources!': [ 694 'sources!': [
702 'corewm/capture_controller_unittest.cc', 695 'corewm/capture_controller_unittest.cc',
703 ], 696 ],
704 }], 697 }],
705 ], 698 ],
706 }, # target_name: views_unittests 699 }, # target_name: views_unittests
707 ], 700 ],
708 } 701 }
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