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..0d3c60781be8df9a2e55e75e4eab64cbd41c9faa 100644 |
--- a/ash/desktop_background/desktop_background_view.h |
+++ b/ash/desktop_background/desktop_background_view.h |
@@ -5,14 +5,19 @@ |
#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 { |
+class PreEventDispatchHandler; |
tdanderson
2014/08/01 19:32:15
This looks pretty crowded. Does the style guide or
rsadam
2014/08/01 19:57:10
git cl format didn't - and i don't see anything in
tdanderson
2014/08/01 20:09:27
The way you have changed it in the latest patch se
|
+} // namespace internal |
class DesktopBackgroundView : public views::View, |
- public views::ContextMenuController { |
+ public views::ContextMenuController, |
+ public ui::EventHandler { |
public: |
DesktopBackgroundView(); |
virtual ~DesktopBackgroundView(); |
@@ -26,6 +31,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); |
}; |