| Index: content/renderer/render_view.h
|
| ===================================================================
|
| --- content/renderer/render_view.h (revision 79652)
|
| +++ content/renderer/render_view.h (working copy)
|
| @@ -68,13 +68,11 @@
|
| class NotificationProvider;
|
| class P2PSocketDispatcher;
|
| class PepperDeviceTest;
|
| -class PrintWebViewHelper;
|
| class RenderViewObserver;
|
| class RenderViewVisitor;
|
| class SearchBox;
|
| class SkBitmap;
|
| class SpeechInputDispatcher;
|
| -class SpellCheckProvider;
|
| class WebPluginDelegatePepper;
|
| class WebPluginDelegateProxy;
|
| class WebUIBindings;
|
| @@ -132,7 +130,9 @@
|
| class WebAccessibilityObject;
|
| class WebApplicationCacheHost;
|
| class WebApplicationCacheHostClient;
|
| +class WebAutoFillClient;
|
| class WebDataSource;
|
| +class WebDevToolsAgentClient;
|
| class WebDocument;
|
| class WebDragData;
|
| class WebFrame;
|
| @@ -191,16 +191,11 @@
|
| // responsible for creating this RenderView (corresponding to parent_hwnd).
|
| // |counter| is either a currently initialized counter, or NULL (in which case
|
| // we treat this RenderView as a top level window).
|
| - static RenderView* Create(
|
| - RenderThreadBase* render_thread,
|
| - gfx::NativeViewId parent_hwnd,
|
| - int32 opener_id,
|
| - const RendererPreferences& renderer_prefs,
|
| - const WebPreferences& webkit_prefs,
|
| - SharedRenderViewCounter* counter,
|
| - int32 routing_id,
|
| - int64 session_storage_namespace_id,
|
| - const string16& frame_name);
|
| + static RenderView* Create(RenderThreadBase* render_thread,
|
| + const WebPreferences& webkit_prefs,
|
| + SharedRenderViewCounter* counter,
|
| + int32 routing_id,
|
| + int64 session_storage_namespace_id);
|
|
|
| // Visit all RenderViews with a live WebView (i.e., RenderViews that have
|
| // been closed but not yet destroyed are excluded).
|
| @@ -212,6 +207,13 @@
|
| // Sets the "next page id" counter.
|
| static void SetNextPageID(int32 next_page_id);
|
|
|
| + void Init(gfx::NativeViewId parent_hwnd,
|
| + int32 opener_id,
|
| + const RendererPreferences& renderer_prefs,
|
| + const string16& frame_name,
|
| + WebKit::WebAutoFillClient* autofill_agent,
|
| + WebKit::WebDevToolsAgentClient* devtools_agent);
|
| +
|
| // May return NULL when the view is closing.
|
| WebKit::WebView* webview() const;
|
|
|
| @@ -247,8 +249,6 @@
|
| disable_scrollbars_size_limit_.height() <= height));
|
| }
|
|
|
| - SearchBox* searchbox() const { return searchbox_; }
|
| -
|
| const WebKit::WebNode& context_menu_node() { return context_menu_node_; }
|
|
|
| // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
|
| @@ -661,7 +661,6 @@
|
| FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase);
|
| FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
|
| - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, BlockScriptInitiatedPrinting);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, ImeComposition);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, InsertCharacters);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, JSBlockSentAfterPageLoad);
|
| @@ -669,10 +668,7 @@
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnHandleKeyboardEvent);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnImeStateChanged);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnNavStateChanged);
|
| - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnPrintPages);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection);
|
| - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintLayoutTest);
|
| - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, PrintWithIframe);
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL);
|
| #if defined(OS_MACOSX)
|
| FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
|
| @@ -705,14 +701,10 @@
|
| };
|
|
|
| RenderView(RenderThreadBase* render_thread,
|
| - gfx::NativeViewId parent_hwnd,
|
| - int32 opener_id,
|
| - const RendererPreferences& renderer_prefs,
|
| const WebPreferences& webkit_prefs,
|
| SharedRenderViewCounter* counter,
|
| int32 routing_id,
|
| - int64 session_storage_namespace_id,
|
| - const string16& frame_name);
|
| + int64 session_storage_namespace_id);
|
|
|
| // Do not delete directly. This class is reference counted.
|
| virtual ~RenderView();
|
| @@ -1279,9 +1271,6 @@
|
| // along with the RenderView automatically. This is why we just store weak
|
| // references.
|
|
|
| - // Provides access to this renderer from the remote Inspector UI.
|
| - DevToolsAgent* devtools_agent_;
|
| -
|
| // DevToolsClient for renderer hosting developer tools UI. It's NULL for other
|
| // render views.
|
| DevToolsClient* devtools_client_;
|
| @@ -1298,18 +1287,6 @@
|
| // Device orientation dispatcher attached to this view; lazily initialized.
|
| DeviceOrientationDispatcher* device_orientation_dispatcher_;
|
|
|
| - // PrintWebViewHelper handles printing. Weak pointer since it implements
|
| - // RenderViewObserver interface.
|
| - PrintWebViewHelper* print_helper_;
|
| -
|
| - // Weak pointer since it implements RenderViewObserver interface.
|
| - SearchBox* searchbox_;
|
| -
|
| - // spellcheck provider which is registered as a view observer.
|
| - // Note that RenderViewObserver subclasses like this will be deleted
|
| - // automatically during RenderView destruction.
|
| - SpellCheckProvider* spellcheck_provider_;
|
| -
|
| scoped_refptr<AudioMessageFilter> audio_message_filter_;
|
|
|
| // Handles accessibility requests into the renderer side, as well as
|
|
|