| Index: content/browser/renderer_host/render_widget_helper.h
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_helper.h (revision 147462)
|
| +++ content/browser/renderer_host/render_widget_helper.h (working copy)
|
| @@ -29,15 +29,13 @@
|
| class TimeDelta;
|
| }
|
|
|
| +struct ViewHostMsg_CreateWindow_Params;
|
| +struct ViewMsg_SwapOut_Params;
|
| +
|
| namespace content {
|
| class ResourceDispatcherHostImpl;
|
| class SessionStorageNamespace;
|
| -}
|
|
|
| -struct ViewHostMsg_CreateWindow_Params;
|
| -struct ViewMsg_SwapOut_Params;
|
| -
|
| -
|
| // Instantiated per RenderProcessHost to provide various optimizations on
|
| // behalf of a RenderWidgetHost. This class bridges between the IO thread
|
| // where the RenderProcessHost's MessageFilter lives and the UI thread where
|
| @@ -104,13 +102,13 @@
|
| // renderers can refer to.
|
| //
|
| class RenderWidgetHelper
|
| - : public base::RefCountedThreadSafe<
|
| - RenderWidgetHelper, content::BrowserThread::DeleteOnIOThread> {
|
| + : public base::RefCountedThreadSafe<RenderWidgetHelper,
|
| + BrowserThread::DeleteOnIOThread> {
|
| public:
|
| RenderWidgetHelper();
|
|
|
| void Init(int render_process_id,
|
| - content::ResourceDispatcherHostImpl* resource_dispatcher_host);
|
| + ResourceDispatcherHostImpl* resource_dispatcher_host);
|
|
|
| // Gets the next available routing id. This is thread safe.
|
| int GetNextRoutingID();
|
| @@ -149,7 +147,7 @@
|
| base::ProcessHandle render_process,
|
| int* route_id,
|
| int* surface_id,
|
| - content::SessionStorageNamespace* session_storage_namespace);
|
| + SessionStorageNamespace* session_storage_namespace);
|
| void CreateNewWidget(int opener_id,
|
| WebKit::WebPopupType popup_type,
|
| int* route_id,
|
| @@ -176,8 +174,7 @@
|
| class BackingStoreMsgProxy;
|
| friend class BackingStoreMsgProxy;
|
| friend class base::RefCountedThreadSafe<RenderWidgetHelper>;
|
| - friend struct content::BrowserThread::DeleteOnThread<
|
| - content::BrowserThread::IO>;
|
| + friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
|
| friend class base::DeleteHelper<RenderWidgetHelper>;
|
|
|
| typedef std::deque<BackingStoreMsgProxy*> BackingStoreMsgProxyQueue;
|
| @@ -197,7 +194,7 @@
|
| void OnCreateWindowOnUI(
|
| const ViewHostMsg_CreateWindow_Params& params,
|
| int route_id,
|
| - content::SessionStorageNamespace* session_storage_namespace);
|
| + SessionStorageNamespace* session_storage_namespace);
|
|
|
| // Called on the IO thread after a window was created on the UI thread.
|
| void OnCreateWindowOnIO(int route_id);
|
| @@ -241,9 +238,11 @@
|
| // The next routing id to use.
|
| base::AtomicSequenceNumber next_routing_id_;
|
|
|
| - content::ResourceDispatcherHostImpl* resource_dispatcher_host_;
|
| + ResourceDispatcherHostImpl* resource_dispatcher_host_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
|
| };
|
|
|
| +} // namespace content
|
| +
|
| #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
|
|
|