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

Side by Side Diff: ui/base/ui_base.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 27 matching lines...) Expand all
38 '../gfx/gfx.gyp:gfx', 38 '../gfx/gfx.gyp:gfx',
39 ], 39 ],
40 'sources' : [ 40 'sources' : [
41 # Note: file list duplicated in GN build. 41 # Note: file list duplicated in GN build.
42 'accelerators/accelerator.cc', 42 'accelerators/accelerator.cc',
43 'accelerators/accelerator.h', 43 'accelerators/accelerator.h',
44 'accelerators/accelerator_history.cc', 44 'accelerators/accelerator_history.cc',
45 'accelerators/accelerator_history.h', 45 'accelerators/accelerator_history.h',
46 'accelerators/accelerator_manager.cc', 46 'accelerators/accelerator_manager.cc',
47 'accelerators/accelerator_manager.h', 47 'accelerators/accelerator_manager.h',
48 'accelerators/accelerator_processor.h',
48 'accelerators/menu_label_accelerator_util_linux.cc', 49 'accelerators/menu_label_accelerator_util_linux.cc',
49 'accelerators/menu_label_accelerator_util_linux.h', 50 'accelerators/menu_label_accelerator_util_linux.h',
50 'accelerators/platform_accelerator.h', 51 'accelerators/platform_accelerator.h',
51 'accelerators/platform_accelerator_cocoa.h', 52 'accelerators/platform_accelerator_cocoa.h',
52 'accelerators/platform_accelerator_cocoa.mm', 53 'accelerators/platform_accelerator_cocoa.mm',
53 'android/system_ui_resource_type.h', 54 'android/system_ui_resource_type.h',
54 'android/ui_base_jni_registrar.cc', 55 'android/ui_base_jni_registrar.cc',
55 'android/ui_base_jni_registrar.h', 56 'android/ui_base_jni_registrar.h',
56 'android/view_android.cc', 57 'android/view_android.cc',
57 'android/view_android.h', 58 'android/view_android.h',
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 ], 790 ],
790 'variables': { 791 'variables': {
791 'jni_gen_package': 'ui', 792 'jni_gen_package': 'ui',
792 }, 793 },
793 'includes': [ '../../build/jni_generator.gypi' ], 794 'includes': [ '../../build/jni_generator.gypi' ],
794 }, 795 },
795 ], 796 ],
796 }], 797 }],
797 ], 798 ],
798 } 799 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698