| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index f06587d3fca12e18cef38ed4d0044236330bba09..59f65c2fa7901a3d81c000ac0e602397999e667a 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -94,7 +94,6 @@
|
| #include "content/renderer/resizing_mode_selector.h"
|
| #include "content/renderer/savable_resources.h"
|
| #include "content/renderer/speech_recognition_dispatcher.h"
|
| -#include "content/renderer/text_input_client_observer.h"
|
| #include "content/renderer/web_ui_extension_data.h"
|
| #include "content/renderer/websharedworker_proxy.h"
|
| #include "media/audio/audio_output_device.h"
|
| @@ -835,10 +834,6 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| OnEnableAutoResize(params.min_size, params.max_size);
|
| }
|
|
|
| -#if defined(OS_MACOSX)
|
| - new TextInputClientObserver(this);
|
| -#endif // defined(OS_MACOSX)
|
| -
|
| // We don't use HistoryController in OOPIF-enabled modes.
|
| if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
|
| history_controller_.reset(new HistoryController(this));
|
| @@ -3011,21 +3006,4 @@ void RenderViewImpl::UpdateWebViewWithDeviceScaleFactor() {
|
| PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
|
| }
|
|
|
| -#if defined(ENABLE_PLUGINS)
|
| -PepperPluginInstanceImpl* RenderViewImpl::GetFocusedPepperPlugin() {
|
| - blink::WebFrame* frame = GetWebView()->mainFrame();
|
| -
|
| - while (frame) {
|
| - if (frame->isWebLocalFrame()) {
|
| - RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
|
| - if (render_frame->focused_pepper_plugin())
|
| - return render_frame->focused_pepper_plugin();
|
| - }
|
| - frame = frame->traverseNext(false);
|
| - }
|
| -
|
| - return nullptr;
|
| -}
|
| -#endif
|
| -
|
| } // namespace content
|
|
|