Reverting dfisher changes 133386 and 13381

TBR=darin



Review URL: http://codereview.chromium.org/58018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13387 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 10 deletions

diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 294c73a..7ee2c04 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -65,26 +65,23 @@ class RenderWidget : public IPC::Channel::Listener,
 
   // WebWidgetDelegate
   virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
-  virtual void DidInvalidateRect(WebWidget* webwidget,
-                                 const WebKit::WebRect& rect);
+  virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
-                             const WebKit::WebRect& clip_rect);
+                             const gfx::Rect& clip_rect);
   virtual void SetCursor(WebWidget* webwidget, const WebCursor& cursor);
   virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition);
   virtual void ShowWithItems(WebWidget* webwidget,
-                             const WebKit::WebRect& bounds,
+                             const gfx::Rect& bounds,
                              int item_height,
                              int selected_index,
                              const std::vector<MenuItem>& items);
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
-  virtual void GetWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
-  virtual void SetWindowRect(WebWidget* webwidget,
-                             const WebKit::WebRect& rect);
-  virtual void GetRootWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
-  virtual void GetRootWindowResizerRect(WebWidget* webwidget,
-                                        WebKit::WebRect* rect);
+  virtual void GetWindowRect(WebWidget* webwidget, gfx::Rect* rect);
+  virtual void SetWindowRect(WebWidget* webwidget, const gfx::Rect& rect);
+  virtual void GetRootWindowRect(WebWidget* webwidget, gfx::Rect* rect);
+  virtual void GetRootWindowResizerRect(WebWidget* webwidget, gfx::Rect* rect);
   virtual void DidMove(WebWidget* webwidget, const WebPluginGeometry& move);
   virtual void RunModal(WebWidget* webwidget) {}
   virtual bool IsHidden(WebWidget* webwidget) { return is_hidden_; }