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

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

Powered by Google App Engine
This is Rietveld 408576698