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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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
oshima 2016/04/08 07:09:39 include?
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
11 #include "ui/views/context_menu_controller.h" 11 #include "ui/views/context_menu_controller.h"
12 #include "ui/views/view.h" 12 #include "ui/views/view.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 class PreEventDispatchHandler; 16 class PreEventDispatchHandler;
17 17
18 class DesktopBackgroundView : public views::View, 18 class DesktopBackgroundView : public views::View,
19 public views::ContextMenuController { 19 public views::ContextMenuController {
20 public: 20 public:
21 DesktopBackgroundView(); 21 DesktopBackgroundView();
22 ~DesktopBackgroundView() override; 22 ~DesktopBackgroundView() override;
23 23
24 private: 24 private:
25 friend class DesktopBackgroundControllerTest; 25 friend class DesktopBackgroundControllerTest;
26 26
27 // Overridden from views::View: 27 // Overridden from views::View:
28 void OnPaint(gfx::Canvas* canvas) override; 28 void OnPaint(gfx::Canvas* canvas) override;
29 bool OnMousePressed(const ui::MouseEvent& event) override; 29 bool OnMousePressed(const ui::MouseEvent& event) override;
30 30
31 // Overridden from views::ContextMenuController: 31 // Overridden from views::ContextMenuController:
32 void ShowContextMenuForView(views::View* source, 32 void ShowContextMenuForView(views::View* source,
33 const gfx::Point& point, 33 const gfx::Point& point,
34 ui::MenuSourceType source_type) override; 34 ui::MenuSourceType source_type) override;
35 scoped_ptr<PreEventDispatchHandler> pre_dispatch_handler_; 35 std::unique_ptr<PreEventDispatchHandler> pre_dispatch_handler_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView); 37 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
38 }; 38 };
39 39
40 } // namespace ash 40 } // namespace ash
41 41
42 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_ 42 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698