Replace webkit/glue/screen_info.h with WebKit/chromium/public/WebScreenInfo.h...

chrome/renderer/render_widget.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_RENDER_WIDGET_H__
 #define CHROME_RENDERER_RENDER_WIDGET_H__
 
 #include <vector>
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
@@ skipping 52 matching lines @@
   // IPC::Message::Sender
   virtual bool Send(IPC::Message* msg);
 
   // WebWidgetDelegate
   virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
                              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 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, 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() { return is_hidden_; }
-  virtual void ShowWithItems(WebWidget* webwidget,
-                             const gfx::Rect& bounds,
-                             int item_height,
-                             int selected_index,
-                             const std::vector<MenuItem>& items);
+  virtual bool IsHidden(WebWidget* webwidget) { return is_hidden_; }
+  virtual WebKit::WebScreenInfo GetScreenInfo(WebWidget* webwidget);
 
   // Close the underlying WebWidget.
   void Close();
 
  protected:
   // Friend RefCounted so that the dtor can be non-public. Using this class
   // without ref-counting is an error.
   friend class base::RefCounted<RenderWidget>;
 
   RenderWidget(RenderThreadBase* render_thread, bool activatable);
@@ skipping 163 matching lines @@
   // Whether the window for this RenderWidget can be activated.
   bool activatable_;
 
   // Holds all the needed plugin window moves for a scroll.
   std::vector<WebPluginGeometry> plugin_window_moves_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H__