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

Side by Side Diff: ash/drag_drop/drag_drop_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 | « ash/display/cursor_window_controller.cc ('k') | ash/root_window_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 (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/drag_drop/drag_drop_controller.h" 5 #include "ash/drag_drop/drag_drop_controller.h"
6 6
7 #include "ash/drag_drop/drag_drop_tracker.h" 7 #include "ash/drag_drop/drag_drop_tracker.h"
8 #include "ash/drag_drop/drag_image_view.h" 8 #include "ash/drag_drop/drag_image_view.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/coordinate_conversion.h" 10 #include "ash/wm/coordinate_conversion.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 virtual gfx::Size GetMinimumSize() const OVERRIDE { 88 virtual gfx::Size GetMinimumSize() const OVERRIDE {
89 return gfx::Size(); 89 return gfx::Size();
90 } 90 }
91 91
92 virtual gfx::Size GetMaximumSize() const OVERRIDE { 92 virtual gfx::Size GetMaximumSize() const OVERRIDE {
93 return gfx::Size(); 93 return gfx::Size();
94 } 94 }
95 95
96 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 96 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
97 const gfx::Rect& new_bounds) OVERRIDE {} 97 const gfx::Rect& new_bounds) OVERRIDE {}
98 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
99 return gfx::kNullCursor;
100 }
98 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { 101 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
99 return HTCAPTION; 102 return HTCAPTION;
100 } 103 }
101 virtual bool ShouldDescendIntoChildForEventHandling( 104 virtual bool ShouldDescendIntoChildForEventHandling(
102 aura::Window* child, 105 aura::Window* child,
103 const gfx::Point& location) OVERRIDE { 106 const gfx::Point& location) OVERRIDE {
104 return true; 107 return true;
105 } 108 }
106 virtual bool CanFocus() OVERRIDE { return true; } 109 virtual bool CanFocus() OVERRIDE { return true; }
107 virtual void OnCaptureLost() OVERRIDE { 110 virtual void OnCaptureLost() OVERRIDE {
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 drag_window_->RemoveObserver(this); 557 drag_window_->RemoveObserver(this);
555 drag_window_ = NULL; 558 drag_window_ = NULL;
556 drag_data_ = NULL; 559 drag_data_ = NULL;
557 // Cleanup can be called again while deleting DragDropTracker, so use Pass 560 // Cleanup can be called again while deleting DragDropTracker, so use Pass
558 // instead of reset to avoid double free. 561 // instead of reset to avoid double free.
559 drag_drop_tracker_.Pass(); 562 drag_drop_tracker_.Pass();
560 } 563 }
561 564
562 } // namespace internal 565 } // namespace internal
563 } // namespace ash 566 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698