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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 211733003: 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 OverscrollMode new_mode) OVERRIDE; 147 OverscrollMode new_mode) OVERRIDE;
148 148
149 // Overridden from ui::ImplicitAnimationObserver: 149 // Overridden from ui::ImplicitAnimationObserver:
150 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 150 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
151 151
152 // Overridden from aura::WindowDelegate: 152 // Overridden from aura::WindowDelegate:
153 virtual gfx::Size GetMinimumSize() const OVERRIDE; 153 virtual gfx::Size GetMinimumSize() const OVERRIDE;
154 virtual gfx::Size GetMaximumSize() const OVERRIDE; 154 virtual gfx::Size GetMaximumSize() const OVERRIDE;
155 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 155 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
156 const gfx::Rect& new_bounds) OVERRIDE; 156 const gfx::Rect& new_bounds) OVERRIDE;
157 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
158 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 157 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
159 virtual bool ShouldDescendIntoChildForEventHandling( 158 virtual bool ShouldDescendIntoChildForEventHandling(
160 aura::Window* child, 159 aura::Window* child,
161 const gfx::Point& location) OVERRIDE; 160 const gfx::Point& location) OVERRIDE;
162 virtual bool CanFocus() OVERRIDE; 161 virtual bool CanFocus() OVERRIDE;
163 virtual void OnCaptureLost() OVERRIDE; 162 virtual void OnCaptureLost() OVERRIDE;
164 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 163 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
165 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 164 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
166 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 165 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
167 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 166 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 222
224 scoped_ptr<TouchEditableImplAura> touch_editable_; 223 scoped_ptr<TouchEditableImplAura> touch_editable_;
225 scoped_ptr<GestureNavSimple> gesture_nav_simple_; 224 scoped_ptr<GestureNavSimple> gesture_nav_simple_;
226 225
227 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 226 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
228 }; 227 };
229 228
230 } // namespace content 229 } // namespace content
231 230
232 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 231 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/aura/image_window_delegate.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698