Move a bunch of code in content\renderer to the content namespace.

content/renderer/render_widget.h

 // Copyright (c) 2012 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 CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "content/common/content_export.h"
 #include "content/renderer/paint_aggregator.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/webcursor.h"
 
 struct ViewHostMsg_UpdateRect_Params;
 class ViewHostMsg_UpdateRect;
 
 namespace IPC {
 class SyncMessage;
 }
 
 namespace WebKit {
 class WebMouseEvent;
 class WebTouchEvent;
-class WebWidget;
-}
-
-namespace content {
-struct GpuRenderingStats;
-class RenderWidgetTest;
-}
-
-namespace gfx {
-class Point;
 }
 
 namespace skia {
 class PlatformCanvas;
 }
 
 namespace ui {
 class Range;
 }
 
 namespace webkit {
 namespace npapi {
 struct WebPluginGeometry;
 }  // namespace npapi
 
 namespace ppapi {
 class PluginInstance;
 }  // namespace ppapi
 }  // namespace webkit
 
+namespace content {
+struct GpuRenderingStats;
+class RenderWidgetTest;
+
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class CONTENT_EXPORT RenderWidget
     : public IPC::Listener,
       public IPC::Sender,
       NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient),
       public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside.
@@ skipping 72 matching lines @@
   // Fills in a WebRenderingStats struct containing information about
   // rendering, e.g. count of frames rendered, time spent painting.
   // This call is relatively expensive in threaded compositing mode,
   // as it blocks on the compositor thread.
   void GetRenderingStats(WebKit::WebRenderingStats&) const;
 
   // Fills in a GpuRenderingStats struct containing information about
   // GPU rendering, e.g. count of texture uploads performed, time spent
   // uploading.
   // This call is relatively expensive as it blocks on the GPU process
-  bool GetGpuRenderingStats(content::GpuRenderingStats*) const;
+  bool GetGpuRenderingStats(GpuRenderingStats*) const;
 
   // Callback for use with BeginSmoothScroll.
   typedef base::Callback<void()> SmoothScrollCompletionCallback;
 
   // Directs the host to begin a smooth scroll. This scroll should have the same
   // performance characteristics as a user-initiated scroll. Returns an ID of
   // the scroll gesture.
   void BeginSmoothScroll(bool scroll_down,
                          bool scroll_far,
                          const SmoothScrollCompletionCallback& callback,
@@ skipping 10 matching lines @@
   enum ShowIme {
     DO_NOT_SHOW_IME,
     SHOW_IME_IF_NEEDED
   };
 
  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>;
   // For unit tests.
-  friend class content::RenderWidgetTest;
+  friend class RenderWidgetTest;
 
   enum ResizeAck {
     SEND_RESIZE_ACK,
     NO_RESIZE_ACK,
   };
 
   RenderWidget(WebKit::WebPopupType popup_type,
                const WebKit::WebScreenInfo& screen_info,
                bool swapped_out);
 
@@ skipping 155 matching lines @@
   // the new value will be sent to the browser process.
   virtual void UpdateSelectionBounds();
 
   // Checks if the composition range or composition character bounds have been
   // changed. If they are changed, the new value will be sent to the browser
   // process.
   virtual void UpdateCompositionInfo(
       const ui::Range& range,
       const std::vector<gfx::Rect>& character_bounds);
 
-
   // Override point to obtain that the current input method state and caret
   // position.
   virtual ui::TextInputType GetTextInputType();
   virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end);
   virtual ui::TextInputType WebKitToUiTextInputType(
       WebKit::WebTextInputType type);
 
   // Override point to obtain that the current composition character bounds.
   // In the case of surrogate pairs, the character is treated as two characters:
   // the bounds for first character is actual one, and the bounds for second
@@ skipping 224 matching lines @@
 
   // State associated with the BeginSmoothScroll synthetic scrolling function.
   int next_smooth_scroll_gesture_id_;
   typedef std::map<int, SmoothScrollCompletionCallback>
       PendingSmoothScrollGestureMap;
   PendingSmoothScrollGestureMap pending_smooth_scroll_gestures_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_