chrome/browser/chromeos/accessibility/accessibility_manager.cc - Issue 709813004: Remove the deprecated function ExtensionService::extensions().

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/chromeos/accessibility/accessibility_manager.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed thestig@'s comments. 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/chromeos/file_manager/file_browser_handlers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc

diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc

index a795d09f5d46b20558fd2f57ce0a0d0e109bfed4..620b591e416c4db937cdc9f1662a82838467c5c0 100644

--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc

+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -48,6 +48,7 @@

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_ui.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/file_reader.h"

#include "extensions/common/extension.h"

@@ -198,8 +199,9 @@ void InjectChromeVoxContentScript(

if (!render_view_host)

return;

const extensions::Extension* extension =

- extension_service->extensions()->GetByID(

- extension_misc::kChromeVoxExtensionId);

+ extensions::ExtensionRegistry::Get(extension_service->profile())

+ ->enabled_extensions()

+ .GetByID(extension_misc::kChromeVoxExtensionId);

// Set a flag to tell ChromeVox that it's just been enabled,

// so that it won't interrupt our speech feedback enabled message.

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/chromeos/file_manager/file_browser_handlers.cc » ('j') | no next file with comments »