Chromium Code Reviews| Index: ash/desktop_background/desktop_background_view.h |
| diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h |
| index c25f9d9bff9acdb5850c09178729dab069ff6a65..54718341b8169d901e0491ff75be92c23f711881 100644 |
| --- a/ash/desktop_background/desktop_background_view.h |
| +++ b/ash/desktop_background/desktop_background_view.h |
| @@ -5,14 +5,21 @@ |
| #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ |
| #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ |
| +#include "ui/events/event.h" |
| #include "ui/gfx/image/image_skia.h" |
| #include "ui/views/context_menu_controller.h" |
| #include "ui/views/view.h" |
| namespace ash { |
| +namespace internal { |
|
bshe
2014/08/05 11:38:29
namespace internal is discouraged, see: https://co
rsadam
2014/08/05 14:52:55
Done.
|
| + |
| +class PreEventDispatchHandler; |
| + |
| +} // namespace internal |
| class DesktopBackgroundView : public views::View, |
| - public views::ContextMenuController { |
| + public views::ContextMenuController, |
| + public ui::EventHandler { |
| public: |
| DesktopBackgroundView(); |
| virtual ~DesktopBackgroundView(); |
| @@ -26,6 +33,7 @@ class DesktopBackgroundView : public views::View, |
| virtual void ShowContextMenuForView(views::View* source, |
| const gfx::Point& point, |
| ui::MenuSourceType source_type) OVERRIDE; |
| + scoped_ptr<internal::PreEventDispatchHandler> pre_dispatch_handler_; |
| DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); |
| }; |