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

Unified Diff: chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp

Issue 2939133004: Added to options page to let users change keyboard mappings. (Closed)
Patch Set: Fixed merge conflict and formatting error Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp
diff --git a/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp b/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp
index 1b127ee05a7f4a96400d0308b7c4ad6a282dcb57..a77a2a2545da6de3fab69b2d9e725c5bd94be238 100644
--- a/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp
+++ b/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp
@@ -8,7 +8,6 @@
'target_name': 'auto_scan_manager',
'dependencies': [
'switch_access_interface',
- 'prefs',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
@@ -37,6 +36,13 @@
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
+ {
+ 'target_name': 'commands',
+ 'dependencies': [
+ 'switch_access_interface',
+ ],
+ 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+ },
{
'target_name': 'keyboard_handler',
'dependencies': [
@@ -49,7 +55,6 @@
'target_name': 'options',
'dependencies': [
'<(EXTERNS_GYP):chrome_extensions',
- 'prefs',
'switch_access',
'background',
],
@@ -59,6 +64,7 @@
'target_name': 'prefs',
'dependencies': [
'<(EXTERNS_GYP):chrome_extensions',
+ 'switch_access_interface',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
@@ -67,18 +73,17 @@
'dependencies': [
'<(EXTERNS_GYP):automation',
'<(EXTERNS_GYP):chrome_extensions',
- 'prefs',
'auto_scan_manager',
'automation_manager',
+ 'commands',
'keyboard_handler',
+ 'prefs',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
'target_name': 'switch_access_interface',
- 'dependencies': [
- 'prefs',
- ],
+ 'dependencies': [],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{

Powered by Google App Engine
This is Rietveld 408576698