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

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

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« 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 27 matching lines...) Expand all
38 class WebColorChooser; 38 class WebColorChooser;
39 39
40 class ColorChooserUIController : public WebColorChooserClient, public ColorChoos er { 40 class ColorChooserUIController : public WebColorChooserClient, public ColorChoos er {
41 public: 41 public:
42 ColorChooserUIController(LocalFrame*, ColorChooserClient*); 42 ColorChooserUIController(LocalFrame*, ColorChooserClient*);
43 virtual ~ColorChooserUIController(); 43 virtual ~ColorChooserUIController();
44 44
45 virtual void openUI(); 45 virtual void openUI();
46 46
47 // ColorChooser functions: 47 // ColorChooser functions:
48 virtual void setSelectedColor(const Color&) OVERRIDE FINAL; 48 virtual void setSelectedColor(const Color&) override final;
49 virtual void endChooser() OVERRIDE; 49 virtual void endChooser() override;
50 virtual AXObject* rootAXObject() OVERRIDE; 50 virtual AXObject* rootAXObject() override;
51 51
52 // WebColorChooserClient functions: 52 // WebColorChooserClient functions:
53 virtual void didChooseColor(const WebColor&) OVERRIDE FINAL; 53 virtual void didChooseColor(const WebColor&) override final;
54 virtual void didEndChooser() OVERRIDE FINAL; 54 virtual void didEndChooser() override final;
55 55
56 protected: 56 protected:
57 void openColorChooser(); 57 void openColorChooser();
58 OwnPtr<WebColorChooser> m_chooser; 58 OwnPtr<WebColorChooser> m_chooser;
59 59
60 private: 60 private:
61 LocalFrame* m_frame; 61 LocalFrame* m_frame;
62 ColorChooserClient* m_client; 62 ColorChooserClient* m_client;
63 }; 63 };
64 64
65 } 65 }
66 66
67 #endif // ColorChooserUIController_h 67 #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