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

chrome/common/render_messages_internal.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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #include "base/clipboard.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "chrome/common/ipc_message_macros.h"
 #include "chrome/common/transport_dib.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/dom_operations.h"
-#include "webkit/glue/screen_info.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webplugin.h"
 
 // TODO(mpcomplete): rename ViewMsg and ViewHostMsg to something that makes
 // more sense with our current design.
 
 //-----------------------------------------------------------------------------
 // RenderView messages
 // These are messages sent from the browser to the renderer process.
 
@@ skipping 842 matching lines @@
                               string16 /* markup */,
                               GURL /* url */)
 
 #if defined(OS_WIN)
   // Request that the given font be loaded by the browser.
   // Please see ResourceMessageFilter::OnLoadFont for details.
   IPC_SYNC_MESSAGE_CONTROL1_0(ViewHostMsg_LoadFont,
                               LOGFONT /* font data */)
 #endif  // defined(OS_WIN)
 
-  // Returns ScreenInfo corresponding to the given window.
+  // Returns WebScreenInfo corresponding to the view.
+  // TODO(darin): Change this to be a routed message so we don't need to pass
+  // the view id.
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetScreenInfo,
-                              gfx::NativeViewId /* window */,
-                              webkit_glue::ScreenInfo /* results */)
+                              gfx::NativeViewId /* native view id */,
+                              WebKit::WebScreenInfo /* results */)
 
   // Send the tooltip text for the current mouse position to the browser.
   IPC_MESSAGE_ROUTED1(ViewHostMsg_SetTooltipText,
                       std::wstring /* tooltip text string */)
 
   // Asks the browser to display the file chooser.  The result is returned in a
   // ViewHost_RunFileChooserResponse message.
   IPC_MESSAGE_ROUTED4(ViewHostMsg_RunFileChooser,
                       bool /* multiple_files */,
                       std::wstring /* title */,
@@ skipping 367 matching lines @@
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_OpenChannelToExtension,
                               std::string /* extension_id */,
                               int /* channel_id */)
 
   // Send a message to an extension process.  The handle is the value returned
   // by ViewHostMsg_OpenChannelToExtension.
   IPC_MESSAGE_CONTROL2(ViewHostMsg_ExtensionPostMessage,
                        int /* channel_id */,
                        std::string /* message */)
 IPC_END_MESSAGES(ViewHost)