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

Side by Side Diff: ash/root_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 (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 "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 class EmptyWindowDelegate : public aura::WindowDelegate { 228 class EmptyWindowDelegate : public aura::WindowDelegate {
229 public: 229 public:
230 EmptyWindowDelegate() {} 230 EmptyWindowDelegate() {}
231 ~EmptyWindowDelegate() override {} 231 ~EmptyWindowDelegate() override {}
232 232
233 // aura::WindowDelegate overrides: 233 // aura::WindowDelegate overrides:
234 gfx::Size GetMinimumSize() const override { return gfx::Size(); } 234 gfx::Size GetMinimumSize() const override { return gfx::Size(); }
235 gfx::Size GetMaximumSize() const override { return gfx::Size(); } 235 gfx::Size GetMaximumSize() const override { return gfx::Size(); }
236 void OnBoundsChanged(const gfx::Rect& old_bounds, 236 void OnBoundsChanged(const gfx::Rect& old_bounds,
237 const gfx::Rect& new_bounds) override {} 237 const gfx::Rect& new_bounds) override {}
238 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
239 gfx::NativeCursor GetCursor(const gfx::Point& point) override { 238 gfx::NativeCursor GetCursor(const gfx::Point& point) override {
240 return gfx::kNullCursor; 239 return gfx::kNullCursor;
241 } 240 }
242 int GetNonClientComponent(const gfx::Point& point) const override { 241 int GetNonClientComponent(const gfx::Point& point) const override {
243 return HTNOWHERE; 242 return HTNOWHERE;
244 } 243 }
245 bool ShouldDescendIntoChildForEventHandling( 244 bool ShouldDescendIntoChildForEventHandling(
246 aura::Window* child, 245 aura::Window* child,
247 const gfx::Point& location) override { 246 const gfx::Point& location) override {
248 return false; 247 return false;
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 else 1058 else
1060 DisableTouchHudProjection(); 1059 DisableTouchHudProjection();
1061 } 1060 }
1062 1061
1063 RootWindowController* GetRootWindowController( 1062 RootWindowController* GetRootWindowController(
1064 const aura::Window* root_window) { 1063 const aura::Window* root_window) {
1065 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1064 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1066 } 1065 }
1067 1066
1068 } // namespace ash 1067 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698