chrome/chrome_resources.gyp - Issue 584313003: Enable runtime switching between ChromeVox and ChromeVox next via command line.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_resources.gyp

Issue 584313003: Enable runtime switching between ChromeVox and ChromeVox next via command line. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« chrome/browser/resources/chromeos/chromevox2/cvox2/background/background.extjs ('K') | « chrome/browser/resources/chromeos/chromevox2/cvox2/background/background.extjs ('k') | chrome/common/extensions/extension_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_resources.gyp

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp

index d2a04e14b38ad7a4ab29ee8430a6e5e7ff96c118..ac4e98a43601a498cc484a977a3b19b646ff8846 100644

--- a/chrome/chrome_resources.gyp

+++ b/chrome/chrome_resources.gyp

@@ -111,17 +111,9 @@

}],

['chromeos==1 and disable_nacl==0 and disable_nacl_untrusted==0', {

- 'conditions': [

- # TODO(dtseng): Remove use_chromevox_next once ChromeVox Next is ready for testing.

- ['use_chromevox_next==1', {

- 'dependencies': [

- 'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2',

- ],

- }, { # else use_chromevox_next == 0

- 'dependencies': [

- 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox',

- ],

- }],

+ 'dependencies': [

+ 'browser/resources/chromeos/chromevox/chromevox.gyp:chromevox',

+ 'browser/resources/chromeos/chromevox2/chromevox.gyp:chromevox2',

Peter Lundblad 2014/09/23 09:06:20 Maybe unify to only have one dependency here to cl

David Tseng 2014/09/23 17:16:31 I'd like to keep both separated since (at some tim

}],

['enable_extensions==1', {