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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_plugin/test_browser_plugin_guest.h

Issue 12207144: Apply merge from @fsamuel. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 10 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 | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/browser_plugin/test_browser_plugin_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_plugin/test_browser_plugin_guest.h
===================================================================
--- content/browser/browser_plugin/test_browser_plugin_guest.h (revision 182101)
+++ content/browser/browser_plugin/test_browser_plugin_guest.h (working copy)
@@ -45,13 +45,8 @@
virtual bool ViewTakeFocus(bool reverse) OVERRIDE;
virtual void Reload() OVERRIDE;
virtual void Stop() OVERRIDE;
- virtual void SetDamageBuffer(TransportDIB* damage_buffer,
-#if defined(OS_WIN)
- int damage_buffer_size,
- TransportDIB::Handle remote_handle,
-#endif
- const gfx::Size& damage_view_size,
- float scale_factor) OVERRIDE;
+ virtual void SetDamageBuffer(
+ const BrowserPluginHostMsg_ResizeGuest_Params& params) OVERRIDE;
virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
// Test utilities to wait for a event we are interested in.
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/browser_plugin/test_browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698