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

Side by Side Diff: content/browser/web_contents/aura/image_window_delegate.h

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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_
7 7
8 #include "content/common/content_export.h" 8 #include "content/common/content_export.h"
9 #include "ui/aura/window_delegate.h" 9 #include "ui/aura/window_delegate.h"
10 #include "ui/gfx/image/image.h" 10 #include "ui/gfx/image/image.h"
(...skipping 11 matching lines...) Expand all
22 bool has_image() const { return !image_.IsEmpty(); } 22 bool has_image() const { return !image_.IsEmpty(); }
23 23
24 protected: 24 protected:
25 virtual ~ImageWindowDelegate(); 25 virtual ~ImageWindowDelegate();
26 26
27 // Overridden from aura::WindowDelegate: 27 // Overridden from aura::WindowDelegate:
28 virtual gfx::Size GetMinimumSize() const OVERRIDE; 28 virtual gfx::Size GetMinimumSize() const OVERRIDE;
29 virtual gfx::Size GetMaximumSize() const OVERRIDE; 29 virtual gfx::Size GetMaximumSize() const OVERRIDE;
30 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 30 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
31 const gfx::Rect& new_bounds) OVERRIDE; 31 const gfx::Rect& new_bounds) OVERRIDE;
32 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
32 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 33 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
33 virtual bool ShouldDescendIntoChildForEventHandling( 34 virtual bool ShouldDescendIntoChildForEventHandling(
34 aura::Window* child, 35 aura::Window* child,
35 const gfx::Point& location) OVERRIDE; 36 const gfx::Point& location) OVERRIDE;
36 virtual bool CanFocus() OVERRIDE; 37 virtual bool CanFocus() OVERRIDE;
37 virtual void OnCaptureLost() OVERRIDE; 38 virtual void OnCaptureLost() OVERRIDE;
38 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 39 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
39 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 40 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
40 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 41 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
41 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 42 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
(...skipping 11 matching lines...) Expand all
53 // the image size is smaller than the window size, then the delegate paints a 54 // the image size is smaller than the window size, then the delegate paints a
54 // white background for the missing regions. 55 // white background for the missing regions.
55 bool size_mismatch_; 56 bool size_mismatch_;
56 57
57 DISALLOW_COPY_AND_ASSIGN(ImageWindowDelegate); 58 DISALLOW_COPY_AND_ASSIGN(ImageWindowDelegate);
58 }; 59 };
59 60
60 } // namespace content 61 } // namespace content
61 62
62 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_ 63 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_IMAGE_WINDOW_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698