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

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

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 # Sources lists shared with GN build. 7 # Sources lists shared with GN build.
8 'views_sources': [ 8 'views_sources': [
9 'accessibility/native_view_accessibility.cc', 9 'accessibility/native_view_accessibility.cc',
10 'accessibility/native_view_accessibility.h', 10 'accessibility/native_view_accessibility.h',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 'drag_utils_mac.mm', 215 'drag_utils_mac.mm',
216 'event_monitor.h', 216 'event_monitor.h',
217 'event_monitor_aura.cc', 217 'event_monitor_aura.cc',
218 'event_monitor_aura.h', 218 'event_monitor_aura.h',
219 'event_monitor_mac.h', 219 'event_monitor_mac.h',
220 'event_monitor_mac.mm', 220 'event_monitor_mac.mm',
221 'focus/external_focus_tracker.cc', 221 'focus/external_focus_tracker.cc',
222 'focus/external_focus_tracker.h', 222 'focus/external_focus_tracker.h',
223 'focus/focus_manager.cc', 223 'focus/focus_manager.cc',
224 'focus/focus_manager.h', 224 'focus/focus_manager.h',
225 'focus/focus_manager_delegate.h',
226 'focus/focus_manager_factory.cc', 225 'focus/focus_manager_factory.cc',
227 'focus/focus_manager_factory.h', 226 'focus/focus_manager_factory.h',
228 'focus/focus_search.cc', 227 'focus/focus_search.cc',
229 'focus/focus_search.h', 228 'focus/focus_search.h',
230 'focus/view_storage.cc', 229 'focus/view_storage.cc',
231 'focus/view_storage.h', 230 'focus/view_storage.h',
232 'focus/widget_focus_manager.cc', 231 'focus/widget_focus_manager.cc',
233 'focus/widget_focus_manager.h', 232 'focus/widget_focus_manager.h',
234 'ime/input_method.h', 233 'ime/input_method.h',
235 'ime/input_method_base.cc', 234 'ime/input_method_base.cc',
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 '../aura/aura.gyp:aura', 892 '../aura/aura.gyp:aura',
894 '../wm/wm.gyp:wm', 893 '../wm/wm.gyp:wm',
895 ], 894 ],
896 }], 895 }],
897 ], 896 ],
898 }, # target_name: macviews_interactive_ui_tests 897 }, # target_name: macviews_interactive_ui_tests
899 ], # targets 898 ], # targets
900 }], 899 }],
901 ], # conditions 900 ], # conditions
902 } 901 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698