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

Side by Side Diff: content/browser/web_contents/aura/image_window_delegate.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/web_contents/aura/image_window_delegate.h" 5 #include "content/browser/web_contents/aura/image_window_delegate.h"
6 6
7 #include "ui/base/cursor/cursor.h" 7 #include "ui/base/cursor/cursor.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 25 matching lines...) Expand all
36 return gfx::Size(); 36 return gfx::Size();
37 } 37 }
38 38
39 void ImageWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds, 39 void ImageWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
40 const gfx::Rect& new_bounds) { 40 const gfx::Rect& new_bounds) {
41 window_size_ = new_bounds.size(); 41 window_size_ = new_bounds.size();
42 if (!image_.IsEmpty()) 42 if (!image_.IsEmpty())
43 size_mismatch_ = window_size_ != image_.AsImageSkia().size(); 43 size_mismatch_ = window_size_ != image_.AsImageSkia().size();
44 } 44 }
45 45
46 gfx::NativeCursor ImageWindowDelegate::GetCursor(const gfx::Point& point) {
47 return gfx::kNullCursor;
48 }
49
46 int ImageWindowDelegate::GetNonClientComponent(const gfx::Point& point) const { 50 int ImageWindowDelegate::GetNonClientComponent(const gfx::Point& point) const {
47 return HTNOWHERE; 51 return HTNOWHERE;
48 } 52 }
49 53
50 bool ImageWindowDelegate::ShouldDescendIntoChildForEventHandling( 54 bool ImageWindowDelegate::ShouldDescendIntoChildForEventHandling(
51 aura::Window* child, 55 aura::Window* child,
52 const gfx::Point& location) { 56 const gfx::Point& location) {
53 return false; 57 return false;
54 } 58 }
55 59
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 92 }
89 93
90 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const { 94 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
91 } 95 }
92 96
93 void ImageWindowDelegate::DidRecreateLayer(ui::Layer *old_layer, 97 void ImageWindowDelegate::DidRecreateLayer(ui::Layer *old_layer,
94 ui::Layer *new_layer) { 98 ui::Layer *new_layer) {
95 } 99 }
96 100
97 } // namespace content 101 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/aura/image_window_delegate.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698