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

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

Issue 11953066: Reland 179231 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DesktopBackgroundView leak Created 7 years, 10 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
« no previous file with comments | « no previous file | ash/launcher/launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/context_menu_controller.h" 9 #include "ui/views/context_menu_controller.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 #include "ui/views/widget/widget_delegate.h"
12 11
13 namespace ash { 12 namespace ash {
14 namespace internal { 13 namespace internal {
15 14
16 class DesktopBackgroundView : public views::WidgetDelegateView, 15 class DesktopBackgroundView : public views::View,
17 public views::ContextMenuController { 16 public views::ContextMenuController {
18 public: 17 public:
19 DesktopBackgroundView(); 18 DesktopBackgroundView();
20 virtual ~DesktopBackgroundView(); 19 virtual ~DesktopBackgroundView();
21 20
22 private: 21 private:
23 // Overridden from views::View: 22 // Overridden from views::View:
24 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 23 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
25 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 24 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
26 25
27 // Overridden from views::ContextMenuController: 26 // Overridden from views::ContextMenuController:
28 virtual void ShowContextMenuForView(views::View* source, 27 virtual void ShowContextMenuForView(views::View* source,
29 const gfx::Point& point) OVERRIDE; 28 const gfx::Point& point) OVERRIDE;
30 29
31 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); 30 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
32 }; 31 };
33 32
34 } // namespace internal 33 } // namespace internal
35 } // namespace ash 34 } // namespace ash
36 35
37 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 36 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698