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

Side by Side Diff: ui/aura/test/test_window_delegate.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/test/test_window_delegate.h ('k') | ui/aura/window.h » ('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) 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/aura/test/test_window_delegate.h" 5 #include "ui/aura/test/test_window_delegate.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/base/hit_test.h" 9 #include "ui/base/hit_test.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 gfx::Size TestWindowDelegate::GetMaximumSize() const { 45 gfx::Size TestWindowDelegate::GetMaximumSize() const {
46 return maximum_size_; 46 return maximum_size_;
47 } 47 }
48 48
49 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds, 49 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
50 const gfx::Rect& new_bounds) { 50 const gfx::Rect& new_bounds) {
51 } 51 }
52 52
53 gfx::NativeCursor TestWindowDelegate::GetCursor(const gfx::Point& point) {
54 return gfx::kNullCursor;
55 }
56
53 int TestWindowDelegate::GetNonClientComponent(const gfx::Point& point) const { 57 int TestWindowDelegate::GetNonClientComponent(const gfx::Point& point) const {
54 return window_component_; 58 return window_component_;
55 } 59 }
56 60
57 bool TestWindowDelegate::ShouldDescendIntoChildForEventHandling( 61 bool TestWindowDelegate::ShouldDescendIntoChildForEventHandling(
58 Window* child, 62 Window* child,
59 const gfx::Point& location) { 63 const gfx::Point& location) {
60 return true; 64 return true;
61 } 65 }
62 66
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 222 }
219 223
220 int EventCountDelegate::GetGestureCountAndReset() { 224 int EventCountDelegate::GetGestureCountAndReset() {
221 int gesture_count = gesture_count_; 225 int gesture_count = gesture_count_;
222 gesture_count_ = 0; 226 gesture_count_ = 0;
223 return gesture_count; 227 return gesture_count;
224 } 228 }
225 229
226 } // namespace test 230 } // namespace test
227 } // namespace aura 231 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/test_window_delegate.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698