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

Unified Diff: content/renderer/render_view_impl.h

Issue 218623016: Remove Hack used for merging dependent chromium and blink patches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index fc89eba89db510b0d5d156450f64c693235c6d21..6b05afcf84fe3898914e8cac5d97626d37f4c855 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -401,11 +401,6 @@ class CONTENT_EXPORT RenderViewImpl
virtual bool requestPointerLock();
virtual void requestPointerUnlock();
virtual bool isPointerLocked();
- // FIXME: To be removed as soon as chromium and blink side changes land
- // didActivateCompositor with parameters is still kept in order to land
- // these changes s-chromium - https://codereview.chromium.org/137893025/.
- // s-blink - https://codereview.chromium.org/138523003/
- virtual void didActivateCompositor(int input_handler_identifier);
virtual void didActivateCompositor() OVERRIDE;
virtual void didHandleGestureEvent(const blink::WebGestureEvent& event,
bool event_cancelled) OVERRIDE;
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698