Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: ash/display/cursor_window_controller.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased & removed views::View::GetTextInputClient & removed GetFocusedTextInputClient. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/cursor_window_controller.h" 5 #include "ash/display/cursor_window_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/mirror_window_controller.h" 8 #include "ash/display/mirror_window_controller.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 16 matching lines...) Expand all
27 class CursorWindowDelegate : public aura::WindowDelegate { 27 class CursorWindowDelegate : public aura::WindowDelegate {
28 public: 28 public:
29 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {} 29 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {}
30 ~CursorWindowDelegate() override {} 30 ~CursorWindowDelegate() override {}
31 31
32 // aura::WindowDelegate overrides: 32 // aura::WindowDelegate overrides:
33 gfx::Size GetMinimumSize() const override { return size_; } 33 gfx::Size GetMinimumSize() const override { return size_; }
34 gfx::Size GetMaximumSize() const override { return size_; } 34 gfx::Size GetMaximumSize() const override { return size_; }
35 void OnBoundsChanged(const gfx::Rect& old_bounds, 35 void OnBoundsChanged(const gfx::Rect& old_bounds,
36 const gfx::Rect& new_bounds) override {} 36 const gfx::Rect& new_bounds) override {}
37 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
38 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 37 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
39 return gfx::kNullCursor; 38 return gfx::kNullCursor;
40 } 39 }
41 int GetNonClientComponent(const gfx::Point& point) const override { 40 int GetNonClientComponent(const gfx::Point& point) const override {
42 return HTNOWHERE; 41 return HTNOWHERE;
43 } 42 }
44 bool ShouldDescendIntoChildForEventHandling( 43 bool ShouldDescendIntoChildForEventHandling(
45 aura::Window* child, 44 aura::Window* child,
46 const gfx::Point& location) override { 45 const gfx::Point& location) override {
47 return false; 46 return false;
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 if (!cursor_window_) 269 if (!cursor_window_)
271 return; 270 return;
272 bool visible = (visible_ && cursor_type_ != ui::kCursorNone); 271 bool visible = (visible_ && cursor_type_ != ui::kCursorNone);
273 if (visible) 272 if (visible)
274 cursor_window_->Show(); 273 cursor_window_->Show();
275 else 274 else
276 cursor_window_->Hide(); 275 cursor_window_->Hide();
277 } 276 }
278 277
279 } // namespace ash 278 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/drag_drop/drag_drop_controller.cc » ('j') | ui/views/cocoa/bridged_native_widget.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698