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

Side by Side Diff: ash/display/cursor_window_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, 9 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 | « no previous file | ash/drag_drop/drag_drop_controller.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/display/cursor_window_controller.h" 5 #include "ash/display/cursor_window_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/mirror_window_controller.h" 8 #include "ash/display/mirror_window_controller.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 16 matching lines...) Expand all
27 class CursorWindowDelegate : public aura::WindowDelegate { 27 class CursorWindowDelegate : public aura::WindowDelegate {
28 public: 28 public:
29 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {} 29 CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {}
30 virtual ~CursorWindowDelegate() {} 30 virtual ~CursorWindowDelegate() {}
31 31
32 // aura::WindowDelegate overrides: 32 // aura::WindowDelegate overrides:
33 virtual gfx::Size GetMinimumSize() const OVERRIDE { return size_; } 33 virtual gfx::Size GetMinimumSize() const OVERRIDE { return size_; }
34 virtual gfx::Size GetMaximumSize() const OVERRIDE { return size_; } 34 virtual gfx::Size GetMaximumSize() const OVERRIDE { return size_; }
35 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 35 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
36 const gfx::Rect& new_bounds) OVERRIDE {} 36 const gfx::Rect& new_bounds) OVERRIDE {}
37 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
38 return gfx::kNullCursor;
39 }
37 virtual int GetNonClientComponent( 40 virtual int GetNonClientComponent(
38 const gfx::Point& point) const OVERRIDE { 41 const gfx::Point& point) const OVERRIDE {
39 return HTNOWHERE; 42 return HTNOWHERE;
40 } 43 }
41 virtual bool ShouldDescendIntoChildForEventHandling( 44 virtual bool ShouldDescendIntoChildForEventHandling(
42 aura::Window* child, 45 aura::Window* child,
43 const gfx::Point& location) OVERRIDE { 46 const gfx::Point& location) OVERRIDE {
44 return false; 47 return false;
45 } 48 }
46 virtual bool CanFocus() OVERRIDE { return false; } 49 virtual bool CanFocus() OVERRIDE { return false; }
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 if (cursor_window_) { 255 if (cursor_window_) {
253 cursor_window_->SetBounds(gfx::Rect(delegate_->size())); 256 cursor_window_->SetBounds(gfx::Rect(delegate_->size()));
254 cursor_window_->SchedulePaintInRect( 257 cursor_window_->SchedulePaintInRect(
255 gfx::Rect(cursor_window_->bounds().size())); 258 gfx::Rect(cursor_window_->bounds().size()));
256 UpdateLocation(); 259 UpdateLocation();
257 } 260 }
258 } 261 }
259 262
260 } // namespace internal 263 } // namespace internal
261 } // namespace ash 264 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698