Commiting the changes from my previous cl that are specific to not including ...

chrome/browser/renderer_host/render_widget_host_view.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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
 
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
-#include "chrome/common/render_messages.h"
+#include "webkit/glue/webplugin.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
 namespace IPC {
 class Message;
 }
 
 class RenderProcessHost;
@@ skipping 57 matching lines @@
   // Sets the cursor to the one associated with the specified cursor_type
   virtual void UpdateCursor(const WebCursor& cursor) = 0;
 
   // Updates the displayed cursor to the current one.
   virtual void UpdateCursorIfOverSelf() = 0;
 
   // Indicates whether the page has finished loading.
   virtual void SetIsLoading(bool is_loading) = 0;
 
   // Enable or disable IME for the view.
-  virtual void IMEUpdateStatus(ViewHostMsg_ImeControl control,
-                               const gfx::Rect& caret_rect) = 0;
+  virtual void IMEUpdateStatus(int control, const gfx::Rect& caret_rect) = 0;
 
   // Informs the view that a portion of the widget's backing store was painted.
   // The view should copy the given rect from the backing store of the render
   // widget onto the screen.
   virtual void DidPaintRect(const gfx::Rect& rect) = 0;
 
   // Informs the view that a portion of the widget's backing store was scrolled
   // by dx pixels horizontally and dy pixels vertically. The view should copy
   // the exposed pixels from the backing store of the render widget (which has
   // already been scrolled) onto the screen.
@@ skipping 13 matching lines @@
  protected:
   // Interface class only, do not construct.
   RenderWidgetHostView() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_