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

Side by Side Diff: ui/keyboard/keyboard_controller.cc

Issue 213383007: Revert of Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura/window_delegate.h ('k') | ui/views/controls/native/native_view_host_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 virtual ~KeyboardWindowDelegate() {} 77 virtual ~KeyboardWindowDelegate() {}
78 78
79 private: 79 private:
80 // Overridden from aura::WindowDelegate: 80 // Overridden from aura::WindowDelegate:
81 virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); } 81 virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
82 virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); } 82 virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); }
83 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 83 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
84 const gfx::Rect& new_bounds) OVERRIDE { 84 const gfx::Rect& new_bounds) OVERRIDE {
85 bounds_ = new_bounds; 85 bounds_ = new_bounds;
86 } 86 }
87 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
88 return gfx::kNullCursor;
89 }
87 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { 90 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
88 return HTNOWHERE; 91 return HTNOWHERE;
89 } 92 }
90 virtual bool ShouldDescendIntoChildForEventHandling( 93 virtual bool ShouldDescendIntoChildForEventHandling(
91 aura::Window* child, 94 aura::Window* child,
92 const gfx::Point& location) OVERRIDE { 95 const gfx::Point& location) OVERRIDE {
93 return true; 96 return true;
94 } 97 }
95 virtual bool CanFocus() OVERRIDE { return false; } 98 virtual bool CanFocus() OVERRIDE { return false; }
96 virtual void OnCaptureLost() OVERRIDE {} 99 virtual void OnCaptureLost() OVERRIDE {}
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // background during animation. 411 // background during animation.
409 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds()); 412 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds());
410 proxy_->EnsureCaretInWorkArea(); 413 proxy_->EnsureCaretInWorkArea();
411 } 414 }
412 415
413 void KeyboardController::HideAnimationFinished() { 416 void KeyboardController::HideAnimationFinished() {
414 proxy_->HideKeyboardContainer(container_.get()); 417 proxy_->HideKeyboardContainer(container_.get());
415 } 418 }
416 419
417 } // namespace keyboard 420 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/aura/window_delegate.h ('k') | ui/views/controls/native/native_view_host_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698