chrome/browser/chromeos/accessibility/accessibility_extension_loader.cc - Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code.

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_extension_loader.cc

Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code. (Closed)

Patch Set: Initial patch Created 4 years, 2 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

« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/login/lock/screen_locker.h » ('j') | chrome/browser/chromeos/login/lock/screen_locker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 34faf17da30607ab12b4f4bf9485125eb4f28c98..29a7a24cc02f7fd06aedc88eb95191bcaed9534b 100644

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

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

@@ -8,6 +8,7 @@

#include "base/callback_helpers.h"

#include "base/path_service.h"

#include "chrome/browser/chromeos/login/lock/screen_locker.h"

+#include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"

#include "chrome/browser/chromeos/login/ui/login_display_host.h"

#include "chrome/browser/chromeos/login/ui/webui_login_view.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

@@ -214,7 +215,7 @@ void AccessibilityExtensionLoader::LoadToLockScreen(

ScreenLocker* screen_locker = ScreenLocker::default_screen_locker();

if (screen_locker && screen_locker->locked()) {

- content::WebUI* lock_web_ui = screen_locker->GetAssociatedWebUI();

+ content::WebUI* lock_web_ui = screen_locker->web_ui()->GetWebUI();

if (lock_web_ui) {

Profile* profile = Profile::FromWebUI(lock_web_ui);

loaded_on_lock_screen_ = true;