| Index: ash/touch/touch_observer_hud.cc
|
| diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
|
| index 2292576f01cf46fe2e17913dc7d2f990c2606c90..e78481d569eae4c9fe9a2a56da3096a576663cca 100644
|
| --- a/ash/touch/touch_observer_hud.cc
|
| +++ b/ash/touch/touch_observer_hud.cc
|
| @@ -65,7 +65,8 @@ void TouchObserverHUD::Clear() {}
|
| void TouchObserverHUD::Remove() {
|
| root_window_->RemovePreTargetHandler(this);
|
|
|
| - RootWindowController* controller = GetRootWindowController(root_window_);
|
| + RootWindowController* controller =
|
| + RootWindowController::ForWindow(root_window_);
|
| UnsetHudForRootWindowController(controller);
|
|
|
| widget_->CloseNow();
|
| @@ -111,7 +112,8 @@ void TouchObserverHUD::OnDisplayConfigurationChanging() {
|
|
|
| root_window_->RemovePreTargetHandler(this);
|
|
|
| - RootWindowController* controller = GetRootWindowController(root_window_);
|
| + RootWindowController* controller =
|
| + RootWindowController::ForWindow(root_window_);
|
| UnsetHudForRootWindowController(controller);
|
|
|
| views::Widget::ReparentNativeView(
|
| @@ -134,7 +136,8 @@ void TouchObserverHUD::OnDisplayConfigurationChanged() {
|
| widget_->GetNativeView(),
|
| Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
|
|
|
| - RootWindowController* controller = GetRootWindowController(root_window_);
|
| + RootWindowController* controller =
|
| + RootWindowController::ForWindow(root_window_);
|
| SetHudForRootWindowController(controller);
|
|
|
| root_window_->AddPreTargetHandler(this);
|
|
|