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

Side by Side Diff: ash/desktop_background/desktop_background_view.h

Issue 435023003: Add pretargethandler to exit overview mode on touch/click. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add touch to exit. Created 6 years, 4 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 ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
7 7
8 #include "ui/events/event.h"
8 #include "ui/gfx/image/image_skia.h" 9 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/context_menu_controller.h" 10 #include "ui/views/context_menu_controller.h"
10 #include "ui/views/view.h" 11 #include "ui/views/view.h"
11 12
12 namespace ash { 13 namespace ash {
14 namespace internal {
15 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
16 } // namespace internal
13 17
14 class DesktopBackgroundView : public views::View, 18 class DesktopBackgroundView : public views::View,
15 public views::ContextMenuController { 19 public views::ContextMenuController,
20 public ui::EventHandler {
16 public: 21 public:
17 DesktopBackgroundView(); 22 DesktopBackgroundView();
18 virtual ~DesktopBackgroundView(); 23 virtual ~DesktopBackgroundView();
19 24
20 private: 25 private:
21 // Overridden from views::View: 26 // Overridden from views::View:
22 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 27 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
23 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 28 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
24 29
25 // Overridden from views::ContextMenuController: 30 // Overridden from views::ContextMenuController:
26 virtual void ShowContextMenuForView(views::View* source, 31 virtual void ShowContextMenuForView(views::View* source,
27 const gfx::Point& point, 32 const gfx::Point& point,
28 ui::MenuSourceType source_type) OVERRIDE; 33 ui::MenuSourceType source_type) OVERRIDE;
34 scoped_ptr<internal::PreEventDispatchHandler> pre_dispatch_handler_;
29 35
30 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); 36 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
31 }; 37 };
32 38
33 } // namespace ash 39 } // namespace ash
34 40
35 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 41 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_view.cc » ('j') | ash/desktop_background/desktop_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698