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

Unified Diff: ui/aura/demo/demo_main.cc

Issue 860983004: text input focus: Supports Window::GetFocusedTextInputClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index b0f4efebbdb58067393a1af89745aaad0b430add..78b39a406adf9f7072f13026f8ffbbc403fc6997 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -45,6 +45,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {
void OnBoundsChanged(const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) override {}
+ ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
gfx::NativeCursor GetCursor(const gfx::Point& point) override {
return gfx::kNullCursor;
}
@@ -81,7 +82,7 @@ class DemoWindowTreeClient : public aura::client::WindowTreeClient {
}
~DemoWindowTreeClient() override {
- aura::client::SetWindowTreeClient(window_, NULL);
+ aura::client::SetWindowTreeClient(window_, nullptr);
}
// Overridden from aura::client::WindowTreeClient:
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698