Commit 9f1810ed authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: removes conditional in WizardController for mash

AccessibilityManager is always created, so the mash conditional is not
needed. The conditional dates back to early on in mash when the
AccessibilityManager was not created.

BUG=none
TEST=none

Change-Id: I3a8945aa8659703d8a2edec03a1a46ec3513505a
Reviewed-on: https://chromium-review.googlesource.com/1157214Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579595}
parent ee2eeee1
......@@ -116,7 +116,6 @@
#include "services/service_manager/public/cpp/connector.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/ui_base_features.h"
using content::BrowserThread;
......@@ -300,16 +299,12 @@ WizardController::WizardController()
// In session OOBE was initiated from voice interaction keyboard shortcuts.
is_in_session_oobe_ =
session_manager::SessionManager::Get()->IsSessionStarted();
if (features::IsAshInBrowserProcess()) {
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
if (accessibility_manager) {
// accessibility_manager could be null in Tests.
accessibility_subscription_ = accessibility_manager->RegisterCallback(
base::Bind(&WizardController::OnAccessibilityStatusChanged,
base::Unretained(this)));
}
} else {
NOTIMPLEMENTED();
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
if (accessibility_manager) {
// accessibility_manager could be null in Tests.
accessibility_subscription_ = accessibility_manager->RegisterCallback(
base::Bind(&WizardController::OnAccessibilityStatusChanged,
base::Unretained(this)));
}
oobe_configuration_ = OobeConfiguration::Get()->GetConfiguration().Clone();
OobeConfiguration::Get()->AddObserver(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment