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

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 5 years, 11 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
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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 'wm/lock_state_observer.h', 524 'wm/lock_state_observer.h',
525 'wm/lock_window_state.cc', 525 'wm/lock_window_state.cc',
526 'wm/lock_window_state.h', 526 'wm/lock_window_state.h',
527 'wm/maximize_mode/maximize_mode_controller.cc', 527 'wm/maximize_mode/maximize_mode_controller.cc',
528 'wm/maximize_mode/maximize_mode_controller.h', 528 'wm/maximize_mode/maximize_mode_controller.h',
529 'wm/maximize_mode/maximize_mode_window_manager.cc', 529 'wm/maximize_mode/maximize_mode_window_manager.cc',
530 'wm/maximize_mode/maximize_mode_window_manager.h', 530 'wm/maximize_mode/maximize_mode_window_manager.h',
531 'wm/maximize_mode/maximize_mode_window_state.cc', 531 'wm/maximize_mode/maximize_mode_window_state.cc',
532 'wm/maximize_mode/maximize_mode_window_state.h', 532 'wm/maximize_mode/maximize_mode_window_state.h',
533 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h', 533 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h',
534 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc',
535 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h',
534 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc', 536 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc',
535 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h', 537 'wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h',
536 'wm/maximize_mode/workspace_backdrop_delegate.cc', 538 'wm/maximize_mode/workspace_backdrop_delegate.cc',
537 'wm/maximize_mode/workspace_backdrop_delegate.h', 539 'wm/maximize_mode/workspace_backdrop_delegate.h',
538 'wm/mru_window_tracker.cc', 540 'wm/mru_window_tracker.cc',
539 'wm/mru_window_tracker.h', 541 'wm/mru_window_tracker.h',
540 'wm/overlay_event_filter.cc', 542 'wm/overlay_event_filter.cc',
541 'wm/overlay_event_filter.h', 543 'wm/overlay_event_filter.h',
542 'wm/overview/overview_animation_type.h', 544 'wm/overview/overview_animation_type.h',
543 'wm/overview/scoped_overview_animation_settings.h', 545 'wm/overview/scoped_overview_animation_settings.h',
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 "sticky_keys/sticky_keys_controller.h", 928 "sticky_keys/sticky_keys_controller.h",
927 ], 929 ],
928 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 930 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
929 'msvs_disabled_warnings': [ 4267, ], 931 'msvs_disabled_warnings': [ 4267, ],
930 }], 932 }],
931 ['use_x11==1', { 933 ['use_x11==1', {
932 'dependencies': [ 934 'dependencies': [
933 '../build/linux/system.gyp:xfixes', 935 '../build/linux/system.gyp:xfixes',
934 ], 936 ],
935 }], 937 }],
938 ['use_ozone==1', {
939 'dependencies': [
940 '../ui/ozone/ozone.gyp:ozone',
941 ],
942 }],
936 ['chromeos==1', { 943 ['chromeos==1', {
937 'dependencies': [ 944 'dependencies': [
938 '../chromeos/chromeos.gyp:chromeos', 945 '../chromeos/chromeos.gyp:chromeos',
939 # Ash #includes power_supply_properties.pb.h directly. 946 # Ash #includes power_supply_properties.pb.h directly.
940 '../chromeos/chromeos.gyp:power_manager_proto', 947 '../chromeos/chromeos.gyp:power_manager_proto',
941 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 948 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
942 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 949 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
943 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', 950 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
944 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', 951 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
945 '../ui/display/display.gyp:display', 952 '../ui/display/display.gyp:display',
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 '../build/isolate.gypi', 1289 '../build/isolate.gypi',
1283 ], 1290 ],
1284 'sources': [ 1291 'sources': [
1285 'ash_unittests.isolate', 1292 'ash_unittests.isolate',
1286 ], 1293 ],
1287 }, 1294 },
1288 ], 1295 ],
1289 }], 1296 }],
1290 ], 1297 ],
1291 } 1298 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698