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

Side by Side Diff: ui/aura/window.h

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.cc ('k') | ui/aura/window.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) 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 #ifndef UI_AURA_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 static void ConvertPointToTarget(const Window* source, 210 static void ConvertPointToTarget(const Window* source,
211 const Window* target, 211 const Window* target,
212 gfx::Point* point); 212 gfx::Point* point);
213 static void ConvertRectToTarget(const Window* source, 213 static void ConvertRectToTarget(const Window* source,
214 const Window* target, 214 const Window* target,
215 gfx::Rect* rect); 215 gfx::Rect* rect);
216 216
217 // Moves the cursor to the specified location relative to the window. 217 // Moves the cursor to the specified location relative to the window.
218 virtual void MoveCursorTo(const gfx::Point& point_in_window); 218 virtual void MoveCursorTo(const gfx::Point& point_in_window);
219 219
220 // Returns the cursor for the specified point, in window coordinates.
221 gfx::NativeCursor GetCursor(const gfx::Point& point) const;
222
220 // Sets an 'event filter' for the window. An 'event filter' for a Window is 223 // Sets an 'event filter' for the window. An 'event filter' for a Window is
221 // a pre-target event handler, where the window owns the handler. A window 224 // a pre-target event handler, where the window owns the handler. A window
222 // can have only one such event filter. Setting a new filter removes and 225 // can have only one such event filter. Setting a new filter removes and
223 // destroys any previously installed filter. 226 // destroys any previously installed filter.
224 void SetEventFilter(ui::EventHandler* event_filter); 227 void SetEventFilter(ui::EventHandler* event_filter);
225 228
226 // Add/remove observer. 229 // Add/remove observer.
227 void AddObserver(WindowObserver* observer); 230 void AddObserver(WindowObserver* observer);
228 void RemoveObserver(WindowObserver* observer); 231 void RemoveObserver(WindowObserver* observer);
229 bool HasObserver(WindowObserver* observer); 232 bool HasObserver(WindowObserver* observer);
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 }; 542 };
540 543
541 std::map<const void*, Value> prop_map_; 544 std::map<const void*, Value> prop_map_;
542 545
543 DISALLOW_COPY_AND_ASSIGN(Window); 546 DISALLOW_COPY_AND_ASSIGN(Window);
544 }; 547 };
545 548
546 } // namespace aura 549 } // namespace aura
547 550
548 #endif // UI_AURA_WINDOW_H_ 551 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_window_delegate.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698