Commit e7186bae authored by Darren Shen's avatar Darren Shen Committed by Commit Bot

[VK] Use range for loop instead of iterators in ash keyboard code.

Small change to make the code cleaner.

Change-Id: I6203bc934b0d4c2762670a48445a5d2b67964611
Reviewed-on: https://chromium-review.googlesource.com/1023519Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552882}
parent f59a1d87
......@@ -460,10 +460,8 @@ void Shell::OnRootWindowAdded(aura::Window* root_window) {
void Shell::CreateKeyboard() {
if (keyboard::IsKeyboardEnabled()) {
if (keyboard::KeyboardController::GetInstance()) {
RootWindowControllerList controllers = GetAllRootWindowControllers();
for (RootWindowControllerList::iterator iter = controllers.begin();
iter != controllers.end(); ++iter) {
(*iter)->DeactivateKeyboard(
for (auto* const controller : GetAllRootWindowControllers()) {
controller->DeactivateKeyboard(
keyboard::KeyboardController::GetInstance());
}
}
......@@ -482,10 +480,9 @@ void Shell::DestroyKeyboard() {
// TODO(jamescook): Move keyboard create and hide into ShellPort.
keyboard_ui_->Hide();
if (keyboard::KeyboardController::GetInstance()) {
RootWindowControllerList controllers = GetAllRootWindowControllers();
for (RootWindowControllerList::iterator iter = controllers.begin();
iter != controllers.end(); ++iter) {
(*iter)->DeactivateKeyboard(keyboard::KeyboardController::GetInstance());
for (auto* const controller : GetAllRootWindowControllers()) {
controller->DeactivateKeyboard(
keyboard::KeyboardController::GetInstance());
}
}
keyboard::KeyboardController::ResetInstance(nullptr);
......
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