| Index: ui/keyboard/keyboard_controller.cc
|
| diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
|
| index 35eea5870490d70beccd277fa9b5cec0f0903861..de8bcbede5c901a4e74957ae062b0b8b1685d146 100644
|
| --- a/ui/keyboard/keyboard_controller.cc
|
| +++ b/ui/keyboard/keyboard_controller.cc
|
| @@ -188,8 +188,8 @@ KeyboardController::~KeyboardController() {
|
| }
|
| if (input_method_)
|
| input_method_->RemoveObserver(this);
|
| - FOR_EACH_OBSERVER(KeyboardControllerObserver, observer_list_,
|
| - OnKeyboardClosed());
|
| + for (KeyboardControllerObserver& observer : observer_list_)
|
| + observer.OnKeyboardClosed();
|
| ui_->SetController(nullptr);
|
| }
|
|
|
| @@ -221,9 +221,8 @@ void KeyboardController::NotifyKeyboardBoundsChanging(
|
| const gfx::Rect& new_bounds) {
|
| current_keyboard_bounds_ = new_bounds;
|
| if (ui_->HasKeyboardWindow() && ui_->GetKeyboardWindow()->IsVisible()) {
|
| - FOR_EACH_OBSERVER(KeyboardControllerObserver,
|
| - observer_list_,
|
| - OnKeyboardBoundsChanging(new_bounds));
|
| + for (KeyboardControllerObserver& observer : observer_list_)
|
| + observer.OnKeyboardBoundsChanging(new_bounds);
|
| if (keyboard::IsKeyboardOverscrollEnabled())
|
| ui_->InitInsets(new_bounds);
|
| else
|
| @@ -488,8 +487,8 @@ void KeyboardController::ShowAnimationFinished() {
|
|
|
| void KeyboardController::HideAnimationFinished() {
|
| ui_->HideKeyboardContainer(container_.get());
|
| - FOR_EACH_OBSERVER(KeyboardControllerObserver, observer_list_,
|
| - OnKeyboardHidden());
|
| + for (KeyboardControllerObserver& observer : observer_list_)
|
| + observer.OnKeyboardHidden();
|
| }
|
|
|
| } // namespace keyboard
|
|
|