chrome/browser/extensions/component_loader.cc - Issue 779103002: Revert of Various changes required to support ChromeVox Next to read Views and Windows.

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/browser/extensions/component_loader.cc

Issue 779103002: Revert of Various changes required to support ChromeVox Next to read Views and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/resources/chromeos/chromevox/chromevox.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 907d8a7df3431b2c8e3df0d9667e62a1bbc4b51e..4aa2227e9683948de45db5d6b774fb37958d78c9 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -356,11 +356,19 @@

resources_path.Append(extension_misc::kChromeVoxExtensionPath);

const CommandLine* command_line = CommandLine::ForCurrentProcess();

+ bool is_chromevox_next =

+ command_line->HasSwitch(chromeos::switches::kEnableChromeVoxNext);

bool is_guest = command_line->HasSwitch(chromeos::switches::kGuestSession);

- const char* manifest_filename =

- is_guest ? extension_misc::kChromeVoxGuestManifestFilename

- : extension_misc::kChromeVoxManifestFilename;

+ const char* manifest_filename;

+ if (is_chromevox_next) {

+ manifest_filename =

+ is_guest ? extension_misc::kChromeVoxNextGuestManifestFilename

+ : extension_misc::kChromeVoxNextManifestFilename;

+ } else {

+ manifest_filename =

+ is_guest ? extension_misc::kChromeVoxGuestManifestFilename

+ : extension_misc::kChromeVoxManifestFilename;

+ }

BrowserThread::PostTaskAndReplyWithResult(

BrowserThread::FILE,

FROM_HERE,