| Index: chrome/browser/renderer_host/render_widget_host_view_mac.h
 | 
| ===================================================================
 | 
| --- chrome/browser/renderer_host/render_widget_host_view_mac.h	(revision 69765)
 | 
| +++ chrome/browser/renderer_host/render_widget_host_view_mac.h	(working copy)
 | 
| @@ -184,7 +184,7 @@
 | 
|    virtual void SetSize(const gfx::Size& size);
 | 
|    virtual gfx::NativeView GetNativeView();
 | 
|    virtual void MovePluginWindows(
 | 
| -      const std::vector<webkit::npapi::WebPluginGeometry>& moves);
 | 
| +      const std::vector<webkit_glue::WebPluginGeometry>& moves);
 | 
|    virtual void Focus();
 | 
|    virtual void Blur();
 | 
|    virtual bool HasFocus();
 | 
| 
 | 
| Property changes on: chrome/browser/renderer_host/render_widget_host_view_mac.h
 | 
| ___________________________________________________________________
 | 
| Deleted: svn:mergeinfo
 | 
| 
 | 
| 
 |