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

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

Issue 1230533002: Fix virtual/override/final usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | « Source/web/ColorChooserPopupUIController.h ('k') | Source/web/ContextFeaturesClientImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28 matching lines...) Expand all
39 class WebColorChooser; 39 class WebColorChooser;
40 40
41 class ColorChooserUIController : public NoBaseWillBeGarbageCollectedFinalized<Co lorChooserUIController>, public WebColorChooserClient, public ColorChooser { 41 class ColorChooserUIController : public NoBaseWillBeGarbageCollectedFinalized<Co lorChooserUIController>, public WebColorChooserClient, public ColorChooser {
42 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController); 42 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ColorChooserUIController);
43 public: 43 public:
44 static PassOwnPtrWillBeRawPtr<ColorChooserUIController> create(LocalFrame* f rame, ColorChooserClient* client) 44 static PassOwnPtrWillBeRawPtr<ColorChooserUIController> create(LocalFrame* f rame, ColorChooserClient* client)
45 { 45 {
46 return adoptPtrWillBeNoop(new ColorChooserUIController(frame, client)); 46 return adoptPtrWillBeNoop(new ColorChooserUIController(frame, client));
47 } 47 }
48 48
49 virtual ~ColorChooserUIController(); 49 ~ColorChooserUIController() override;
50 DECLARE_VIRTUAL_TRACE(); 50 DECLARE_VIRTUAL_TRACE();
51 51
52 virtual void openUI(); 52 virtual void openUI();
53 53
54 // ColorChooser functions: 54 // ColorChooser functions:
55 virtual void setSelectedColor(const Color&) override final; 55 void setSelectedColor(const Color&) final;
56 virtual void endChooser() override; 56 void endChooser() override;
57 virtual AXObject* rootAXObject() override; 57 AXObject* rootAXObject() override;
58 58
59 // WebColorChooserClient functions: 59 // WebColorChooserClient functions:
60 virtual void didChooseColor(const WebColor&) override final; 60 void didChooseColor(const WebColor&) final;
61 virtual void didEndChooser() override 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 OwnPtr<WebColorChooser> m_chooser; 67 OwnPtr<WebColorChooser> m_chooser;
68 RawPtrWillBeMember<ColorChooserClient> m_client; 68 RawPtrWillBeMember<ColorChooserClient> m_client;
69 69
70 private: 70 private:
71 RawPtrWillBeMember<LocalFrame> m_frame; 71 RawPtrWillBeMember<LocalFrame> m_frame;
72 }; 72 };
73 73
74 } // namespace blink 74 } // namespace blink
75 75
76 #endif // ColorChooserUIController_h 76 #endif // ColorChooserUIController_h
OLDNEW
« no previous file with comments | « Source/web/ColorChooserPopupUIController.h ('k') | Source/web/ContextFeaturesClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698