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

Side by Side Diff: chrome/browser/resources/settings/languages_page/compiled_resources2.gyp

Issue 2827553002: MD Settings: Use a browser proxy from the languages page. Re-enable test. (Closed)
Patch Set: Remove accidental usage of getInputMethodPrivate() on non-Cros Created 3 years, 8 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 | « no previous file | chrome/browser/resources/settings/languages_page/languages.html » ('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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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': 'languages_browser_proxy',
8 'dependencies': [
9 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
10 '<(EXTERNS_GYP):chrome_send',
11 '<(EXTERNS_GYP):input_method_private',
12 '<(EXTERNS_GYP):language_settings_private',
13 '<(INTERFACES_GYP):input_method_private_interface',
14 '<(INTERFACES_GYP):language_settings_private_interface',
15 ],
16 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
17 },
18 {
7 'target_name': 'languages', 19 'target_name': 'languages',
8 'dependencies': [ 20 'dependencies': [
9 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 21 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
10 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', 22 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
11 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:promise_resolver ', 23 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:promise_resolver ',
12 '<(EXTERNS_GYP):chrome_send',
13 '<(EXTERNS_GYP):input_method_private', 24 '<(EXTERNS_GYP):input_method_private',
14 '<(EXTERNS_GYP):language_settings_private', 25 '<(EXTERNS_GYP):language_settings_private',
15 '<(INTERFACES_GYP):input_method_private_interface', 26 '<(INTERFACES_GYP):input_method_private_interface',
16 '<(INTERFACES_GYP):language_settings_private_interface', 27 '<(INTERFACES_GYP):language_settings_private_interface',
17 '../prefs/compiled_resources2.gyp:prefs_types', 28 '../prefs/compiled_resources2.gyp:prefs_types',
18 '../prefs/compiled_resources2.gyp:prefs', 29 '../prefs/compiled_resources2.gyp:prefs',
19 'languages_types', 30 'languages_types',
31 'languages_browser_proxy',
20 ], 32 ],
21 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 33 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
22 }, 34 },
23 { 35 {
24 'target_name': 'languages_page', 36 'target_name': 'languages_page',
25 'dependencies': [ 37 'dependencies': [
26 '../compiled_resources2.gyp:lifetime_browser_proxy', 38 '../compiled_resources2.gyp:lifetime_browser_proxy',
27 '../compiled_resources2.gyp:route', 39 '../compiled_resources2.gyp:route',
28 '../settings_page/compiled_resources2.gyp:settings_animated_pages', 40 '../settings_page/compiled_resources2.gyp:settings_animated_pages',
29 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-checkbox/co mpiled_resources2.gyp:paper-checkbox-extracted', 41 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-checkbox/co mpiled_resources2.gyp:paper-checkbox-extracted',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 'dependencies': [ 75 'dependencies': [
64 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-checkbox/co mpiled_resources2.gyp:paper-checkbox-extracted', 76 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-checkbox/co mpiled_resources2.gyp:paper-checkbox-extracted',
65 '<(DEPTH)/ui/webui/resources/cr_elements/compiled_resources2.gyp:cr_scro llable_behavior', 77 '<(DEPTH)/ui/webui/resources/cr_elements/compiled_resources2.gyp:cr_scro llable_behavior',
66 'languages', 78 'languages',
67 'languages_types', 79 'languages_types',
68 ], 80 ],
69 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 81 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
70 }, 82 },
71 ], 83 ],
72 } 84 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/languages_page/languages.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698