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

Side by Side Diff: third_party/WebKit/Source/web/ColorChooserUIController.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ColorChooserUIController_h 26 #ifndef ColorChooserUIController_h
27 #define ColorChooserUIController_h 27 #define ColorChooserUIController_h
28 28
29 #include "core/html/forms/ColorChooser.h" 29 #include "core/html/forms/ColorChooser.h"
30 #include "platform/heap/Handle.h" 30 #include "platform/heap/Handle.h"
31 #include "platform/text/PlatformLocale.h" 31 #include "platform/text/PlatformLocale.h"
32 #include "public/web/WebColorChooserClient.h" 32 #include "public/web/WebColorChooserClient.h"
33 #include <memory> 33 #include "wtf/OwnPtr.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class ColorChooserClient; 37 class ColorChooserClient;
38 class LocalFrame; 38 class LocalFrame;
39 class WebColorChooser; 39 class WebColorChooser;
40 40
41 class ColorChooserUIController : public GarbageCollectedFinalized<ColorChooserUI Controller>, public WebColorChooserClient, public ColorChooser { 41 class ColorChooserUIController : public GarbageCollectedFinalized<ColorChooserUI Controller>, public WebColorChooserClient, public ColorChooser {
42 USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController); 42 USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController);
43 public: 43 public:
(...skipping 13 matching lines...) Expand all
57 AXObject* rootAXObject() override; 57 AXObject* rootAXObject() override;
58 58
59 // WebColorChooserClient functions: 59 // WebColorChooserClient functions:
60 void didChooseColor(const WebColor&) final; 60 void didChooseColor(const WebColor&) final;
61 void didEndChooser() final; 61 void didEndChooser() final;
62 62
63 protected: 63 protected:
64 ColorChooserUIController(LocalFrame*, ColorChooserClient*); 64 ColorChooserUIController(LocalFrame*, ColorChooserClient*);
65 65
66 void openColorChooser(); 66 void openColorChooser();
67 std::unique_ptr<WebColorChooser> m_chooser; 67 OwnPtr<WebColorChooser> m_chooser;
68 Member<ColorChooserClient> m_client; 68 Member<ColorChooserClient> m_client;
69 69
70 Member<LocalFrame> m_frame; 70 Member<LocalFrame> m_frame;
71 }; 71 };
72 72
73 } // namespace blink 73 } // namespace blink
74 74
75 #endif // ColorChooserUIController_h 75 #endif // ColorChooserUIController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698