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

Side by Side Diff: ui/views/controls/native/native_view_host_aura.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/controls/native/native_view_host_aura.h" 5 #include "ui/views/controls/native/native_view_host_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/client/focus_client.h" 9 #include "ui/aura/client/focus_client.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 12 matching lines...) Expand all
23 ~ClippingWindowDelegate() override {} 23 ~ClippingWindowDelegate() override {}
24 24
25 void set_native_view(aura::Window* native_view) { 25 void set_native_view(aura::Window* native_view) {
26 native_view_ = native_view; 26 native_view_ = native_view;
27 } 27 }
28 28
29 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 29 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
30 gfx::Size GetMaximumSize() const override { return gfx::Size(); } 30 gfx::Size GetMaximumSize() const override { return gfx::Size(); }
31 void OnBoundsChanged(const gfx::Rect& old_bounds, 31 void OnBoundsChanged(const gfx::Rect& old_bounds,
32 const gfx::Rect& new_bounds) override {} 32 const gfx::Rect& new_bounds) override {}
33 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
34 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 33 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
35 return gfx::kNullCursor; 34 return gfx::kNullCursor;
36 } 35 }
37 int GetNonClientComponent(const gfx::Point& point) const override { 36 int GetNonClientComponent(const gfx::Point& point) const override {
38 return HTCLIENT; 37 return HTCLIENT;
39 } 38 }
40 bool ShouldDescendIntoChildForEventHandling( 39 bool ShouldDescendIntoChildForEventHandling(
41 aura::Window* child, 40 aura::Window* child,
42 const gfx::Point& location) override { 41 const gfx::Point& location) override {
43 return true; 42 return true;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } else { 228 } else {
230 clipping_window_.RemoveChild(host_->native_view()); 229 clipping_window_.RemoveChild(host_->native_view());
231 } 230 }
232 host_->native_view()->SetBounds(clipping_window_.bounds()); 231 host_->native_view()->SetBounds(clipping_window_.bounds());
233 } 232 }
234 if (clipping_window_.parent()) 233 if (clipping_window_.parent())
235 clipping_window_.parent()->RemoveChild(&clipping_window_); 234 clipping_window_.parent()->RemoveChild(&clipping_window_);
236 } 235 }
237 236
238 } // namespace views 237 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698