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

Side by Side Diff: components/app_modal.gypi

Issue 688853005: Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « chrome/test/base/ui_test_utils.cc ('k') | components/app_modal/BUILD.gn » ('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 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 'targets': [ 5 'targets': [
6 { 6 {
7 'target_name': 'app_modal', 7 'target_name': 'app_modal',
8 'type': 'static_library', 8 'type': 'static_library',
9 'dependencies': [ 9 'dependencies': [
10 '../content/content.gyp:content_browser', 10 '../content/content.gyp:content_browser',
11 '../content/content.gyp:content_common', 11 '../content/content.gyp:content_common',
12 '../skia/skia.gyp:skia', 12 '../skia/skia.gyp:skia',
13 'components_strings.gyp:components_strings', 13 'components_strings.gyp:components_strings',
14 ], 14 ],
15 'include_dirs': [ 15 'include_dirs': [
16 '..', 16 '..',
17 ], 17 ],
18 'sources': [ 18 'sources': [
19 'app_modal/app_modal_dialog.cc', 19 'app_modal/app_modal_dialog.cc',
20 'app_modal/app_modal_dialog.h', 20 'app_modal/app_modal_dialog.h',
21 'app_modal/app_modal_dialog_queue.cc', 21 'app_modal/app_modal_dialog_queue.cc',
22 'app_modal/app_modal_dialog_queue.h', 22 'app_modal/app_modal_dialog_queue.h',
23 'app_modal/javascript_app_modal_dialog.cc', 23 'app_modal/javascript_app_modal_dialog.cc',
24 'app_modal/javascript_app_modal_dialog.h', 24 'app_modal/javascript_app_modal_dialog.h',
25 'app_modal/javascript_dialog_extensions_client.h', 25 'app_modal/javascript_dialog_extensions_client.h',
26 'app_modal/javascript_dialog_manager.cc', 26 'app_modal/javascript_dialog_manager.cc',
27 'app_modal/javascript_dialog_manager.h', 27 'app_modal/javascript_dialog_manager.h',
28 'app_modal/javascript_dialog_manager_impl.cc',
29 'app_modal/javascript_dialog_manager_impl.h',
30 'app_modal/javascript_native_dialog_factory.h', 28 'app_modal/javascript_native_dialog_factory.h',
31 'app_modal/native_app_modal_dialog.h' 29 'app_modal/native_app_modal_dialog.h'
32 ], 30 ],
33 'conditions': [ 31 'conditions': [
34 ['use_aura==1',{ 32 ['use_aura==1',{
35 'dependencies': [ 33 'dependencies': [
36 '../ui/aura/aura.gyp:aura', 34 '../ui/aura/aura.gyp:aura',
37 ], 35 ],
38 }], 36 }],
39 ['toolkit_views==1 and OS!="mac"', { 37 ['toolkit_views==1 and OS!="mac"', {
40 'sources': [ 38 'sources': [
41 'app_modal/views/javascript_app_modal_dialog_views.h', 39 'app_modal/views/javascript_app_modal_dialog_views.h',
42 'app_modal/views/javascript_app_modal_dialog_views.cc', 40 'app_modal/views/javascript_app_modal_dialog_views.cc',
43 ], 41 ],
44 }], 42 }],
45 ], 43 ],
46 }, 44 },
47 ], 45 ],
48 } 46 }
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils.cc ('k') | components/app_modal/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698