Chromium Code Reviews| Index: ash/display/cursor_window_controller.cc |
| diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc |
| index ed1f0afc3498a3ef6d63c147f0795347a350b9e8..c7c5897debee7db345fdf6d3af501f6702db19f3 100644 |
| --- a/ash/display/cursor_window_controller.cc |
| +++ b/ash/display/cursor_window_controller.cc |
| @@ -28,7 +28,6 @@ class CursorWindowDelegate : public aura::WindowDelegate { |
| public: |
| CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {} |
| ~CursorWindowDelegate() override {} |
| - |
|
Albert Bodenhamer
2015/05/14 16:42:02
Why the whitespace change?
|
| // aura::WindowDelegate overrides: |
| gfx::Size GetMinimumSize() const override { return size_; } |
| gfx::Size GetMaximumSize() const override { return size_; } |
| @@ -181,8 +180,6 @@ void CursorWindowController::SetCursorSet(ui::CursorSetType cursor_set) { |
| } |
| void CursorWindowController::SetVisibility(bool visible) { |
| - if (!cursor_window_) |
|
Albert Bodenhamer
2015/05/14 16:42:02
What is the removed code supposed to accomplish? I
oshima
2015/05/14 16:58:52
The visibility state has to be updated regardless
|
| - return; |
| visible_ = visible; |
| UpdateCursorVisibility(); |
| } |
| @@ -271,6 +268,7 @@ void CursorWindowController::UpdateCursorImage() { |
| void CursorWindowController::UpdateCursorVisibility() { |
| if (!cursor_window_) |
| return; |
| + |
|
Albert Bodenhamer
2015/05/14 16:42:02
And here?
|
| bool visible = (visible_ && cursor_type_ != ui::kCursorNone); |
| if (visible) |
| cursor_window_->Show(); |