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

Side by Side Diff: ui/keyboard/keyboard_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h" 5 #include "ui/keyboard/keyboard_controller.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 public: 56 public:
57 KeyboardWindowDelegate() {} 57 KeyboardWindowDelegate() {}
58 ~KeyboardWindowDelegate() override {} 58 ~KeyboardWindowDelegate() override {}
59 59
60 private: 60 private:
61 // Overridden from aura::WindowDelegate: 61 // Overridden from aura::WindowDelegate:
62 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 62 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
63 gfx::Size GetMaximumSize() const override { return gfx::Size(); } 63 gfx::Size GetMaximumSize() const override { return gfx::Size(); }
64 void OnBoundsChanged(const gfx::Rect& old_bounds, 64 void OnBoundsChanged(const gfx::Rect& old_bounds,
65 const gfx::Rect& new_bounds) override {} 65 const gfx::Rect& new_bounds) override {}
66 ui::TextInputClient* GetFocusedTextInputClient() override {
67 return nullptr;
68 }
69 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 66 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
70 return gfx::kNullCursor; 67 return gfx::kNullCursor;
71 } 68 }
72 int GetNonClientComponent(const gfx::Point& point) const override { 69 int GetNonClientComponent(const gfx::Point& point) const override {
73 return HTNOWHERE; 70 return HTNOWHERE;
74 } 71 }
75 bool ShouldDescendIntoChildForEventHandling( 72 bool ShouldDescendIntoChildForEventHandling(
76 aura::Window* child, 73 aura::Window* child,
77 const gfx::Point& location) override { 74 const gfx::Point& location) override {
78 return true; 75 return true;
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 proxy_->HideKeyboardContainer(container_.get()); 592 proxy_->HideKeyboardContainer(container_.get());
596 } 593 }
597 594
598 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) { 595 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
599 aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr; 596 aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr;
600 if (target_window) 597 if (target_window)
601 window_bounds_observer_->AddObservedWindow(target_window); 598 window_bounds_observer_->AddObservedWindow(target_window);
602 } 599 }
603 600
604 } // namespace keyboard 601 } // namespace keyboard
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698