summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-13 06:51:19 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-13 06:51:19 +0000
commitb631ffd1c7463c45ccf79448c1ca768fa7d0f1fa (patch)
tree74196c93cb6bee8b98d39a65d9ea7c5870ce30b0 /content
parenta689854e1e36944e38857a07db3164fef5b4d978 (diff)
downloadchromium_src-b631ffd1c7463c45ccf79448c1ca768fa7d0f1fa.zip
chromium_src-b631ffd1c7463c45ccf79448c1ca768fa7d0f1fa.tar.gz
chromium_src-b631ffd1c7463c45ccf79448c1ca768fa7d0f1fa.tar.bz2
Remove OVERRIDE annotations from implementations of WebKit APIs
I'm refactoring these APIs in the WebKit repo but can't sanely stage changes to the API without breaking these OVERRIDE annotations since the interface and implementations are in separate repositories. The clang plugin knows to not enforce OVERRIDE for APIs in the WebKit namespace so this won't break that. BUG= Review URL: https://chromiumcodereview.appspot.com/12250021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_view_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 085478b..95baabd 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -423,7 +423,7 @@ class CONTENT_EXPORT RenderViewImpl
WebKit::WebExternalPopupMenuClient* popup_menu_client);
virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
unsigned quota);
- virtual WebKit::WebCompositorOutputSurface* createOutputSurface() OVERRIDE;
+ virtual WebKit::WebCompositorOutputSurface* createOutputSurface();
virtual void didAddMessageToConsole(
const WebKit::WebConsoleMessage& message,
const WebKit::WebString& source_name,