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

Side by Side Diff: ash/ash.gyp

Issue 806693009: Port ScopedDisableInternalMouseAndKeyboardX11 to Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 'wm/lock_state_observer.h', 523 'wm/lock_state_observer.h',
524 'wm/lock_window_state.cc', 524 'wm/lock_window_state.cc',
525 'wm/lock_window_state.h', 525 'wm/lock_window_state.h',
526 'wm/maximize_mode/maximize_mode_controller.cc', 526 'wm/maximize_mode/maximize_mode_controller.cc',
527 'wm/maximize_mode/maximize_mode_controller.h', 527 'wm/maximize_mode/maximize_mode_controller.h',
528 'wm/maximize_mode/maximize_mode_window_manager.cc', 528 'wm/maximize_mode/maximize_mode_window_manager.cc',
529 'wm/maximize_mode/maximize_mode_window_manager.h', 529 'wm/maximize_mode/maximize_mode_window_manager.h',
530 'wm/maximize_mode/maximize_mode_window_state.cc', 530 'wm/maximize_mode/maximize_mode_window_state.cc',
531 'wm/maximize_mode/maximize_mode_window_state.h', 531 'wm/maximize_mode/maximize_mode_window_state.h',
532 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h', 532 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h',
533 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc',
534 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h',
533 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc', 535 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc',
534 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h', 536 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h',
535 'wm/maximize_mode/workspace_backdrop_delegate.cc', 537 'wm/maximize_mode/workspace_backdrop_delegate.cc',
536 'wm/maximize_mode/workspace_backdrop_delegate.h', 538 'wm/maximize_mode/workspace_backdrop_delegate.h',
537 'wm/mru_window_tracker.cc', 539 'wm/mru_window_tracker.cc',
538 'wm/mru_window_tracker.h', 540 'wm/mru_window_tracker.h',
539 'wm/overlay_event_filter.cc', 541 'wm/overlay_event_filter.cc',
540 'wm/overlay_event_filter.h', 542 'wm/overlay_event_filter.h',
541 'wm/overview/overview_animation_type.h', 543 'wm/overview/overview_animation_type.h',
542 'wm/overview/scoped_overview_animation_settings.h', 544 'wm/overview/scoped_overview_animation_settings.h',
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 "sticky_keys/sticky_keys_controller.h", 934 "sticky_keys/sticky_keys_controller.h",
933 ], 935 ],
934 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 936 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
935 'msvs_disabled_warnings': [ 4267, ], 937 'msvs_disabled_warnings': [ 4267, ],
936 }], 938 }],
937 ['use_x11==1', { 939 ['use_x11==1', {
938 'dependencies': [ 940 'dependencies': [
939 '../build/linux/system.gyp:xfixes', 941 '../build/linux/system.gyp:xfixes',
940 ], 942 ],
941 }], 943 }],
944 ['use_ozone==1', {
945 'dependencies': [
946 '../ui/ozone/ozone.gyp:ozone',
947 ],
948 }],
942 ['chromeos==1', { 949 ['chromeos==1', {
943 'dependencies': [ 950 'dependencies': [
944 '../chromeos/chromeos.gyp:chromeos', 951 '../chromeos/chromeos.gyp:chromeos',
945 # Ash #includes power_supply_properties.pb.h directly. 952 # Ash #includes power_supply_properties.pb.h directly.
946 '../chromeos/chromeos.gyp:power_manager_proto', 953 '../chromeos/chromeos.gyp:power_manager_proto',
947 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 954 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
948 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 955 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
949 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 956 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
950 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 957 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
951 '../ui/display/display.gyp:display', 958 '../ui/display/display.gyp:display',
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 '../build/isolate.gypi', 1296 '../build/isolate.gypi',
1290 ], 1297 ],
1291 'sources': [ 1298 'sources': [
1292 'ash_unittests.isolate', 1299 'ash_unittests.isolate',
1293 ], 1300 ],
1294 }, 1301 },
1295 ], 1302 ],
1296 }], 1303 }],
1297 ], 1304 ],
1298 } 1305 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698