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

Side by Side Diff: ash/root_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
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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // aura::WindowDelegate overrides: 214 // aura::WindowDelegate overrides:
215 virtual gfx::Size GetMinimumSize() const OVERRIDE { 215 virtual gfx::Size GetMinimumSize() const OVERRIDE {
216 return gfx::Size(); 216 return gfx::Size();
217 } 217 }
218 virtual gfx::Size GetMaximumSize() const OVERRIDE { 218 virtual gfx::Size GetMaximumSize() const OVERRIDE {
219 return gfx::Size(); 219 return gfx::Size();
220 } 220 }
221 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 221 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
222 const gfx::Rect& new_bounds) OVERRIDE { 222 const gfx::Rect& new_bounds) OVERRIDE {
223 } 223 }
224 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
225 return gfx::kNullCursor;
226 }
224 virtual int GetNonClientComponent( 227 virtual int GetNonClientComponent(
225 const gfx::Point& point) const OVERRIDE { 228 const gfx::Point& point) const OVERRIDE {
226 return HTNOWHERE; 229 return HTNOWHERE;
227 } 230 }
228 virtual bool ShouldDescendIntoChildForEventHandling( 231 virtual bool ShouldDescendIntoChildForEventHandling(
229 aura::Window* child, 232 aura::Window* child,
230 const gfx::Point& location) OVERRIDE { 233 const gfx::Point& location) OVERRIDE {
231 return false; 234 return false;
232 } 235 }
233 virtual bool CanFocus() OVERRIDE { 236 virtual bool CanFocus() OVERRIDE {
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 DisableTouchHudProjection(); 1005 DisableTouchHudProjection();
1003 } 1006 }
1004 1007
1005 RootWindowController* GetRootWindowController( 1008 RootWindowController* GetRootWindowController(
1006 const aura::Window* root_window) { 1009 const aura::Window* root_window) {
1007 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1010 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1008 } 1011 }
1009 1012
1010 } // namespace internal 1013 } // namespace internal
1011 } // namespace ash 1014 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698