Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: ui/views/controls/webview/webview.cc

Issue 1182523003: Removes TextInputFocusManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit per comment. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/cocoa/bridged_native_widget.mm ('k') | ui/views/controls/webview/webview_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/webview/webview.cc
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
index 059540a6ca341b0906e44792598abae2a9995bb3..adeeadc6ac99830e8f047c1bfba0dd538b5f448c 100644
--- a/ui/views/controls/webview/webview.cc
+++ b/ui/views/controls/webview/webview.cc
@@ -14,7 +14,6 @@
#include "ipc/ipc_message.h"
#include "ui/accessibility/ax_enums.h"
#include "ui/accessibility/ax_view_state.h"
-#include "ui/base/ui_base_switches_util.h"
#include "ui/events/event.h"
#include "ui/views/controls/native/native_view_host.h"
#include "ui/views/focus/focus_manager.h"
@@ -111,21 +110,6 @@ const char* WebView::GetClassName() const {
}
ui::TextInputClient* WebView::GetTextInputClient() {
- // This function delegates the text input handling to the underlying
- // content::RenderWidgetHostView. So when the underlying RWHV is destroyed or
- // replaced with another one, we have to notify the FocusManager through
- // FocusManager::OnTextInputClientChanged() that the focused TextInputClient
- // needs to be updated.
- if (switches::IsTextInputFocusManagerEnabled() &&
- web_contents() && !web_contents()->IsBeingDestroyed()) {
- const content::RenderViewHost* host = web_contents()->GetRenderViewHost();
- content::RenderWidgetHostView* host_view =
- is_embedding_fullscreen_widget_ ?
- web_contents()->GetFullscreenRenderWidgetHostView() :
- web_contents()->GetRenderWidgetHostView();
- if (host && host->IsRenderViewLive() && host_view)
- return host_view->GetTextInputClient();
- }
return NULL;
}
@@ -393,11 +377,6 @@ void WebView::ReattachForFullscreenChange(bool enter_fullscreen) {
}
void WebView::NotifyMaybeTextInputClientAndAccessibilityChanged() {
- // Update the TextInputClient as needed; see GetTextInputClient().
- FocusManager* const focus_manager = GetFocusManager();
- if (focus_manager)
- focus_manager->OnTextInputClientChanged(this);
-
#if defined(OS_CHROMEOS)
if (web_contents())
NotifyAccessibilityEvent(ui::AX_EVENT_CHILDREN_CHANGED, false);
« no previous file with comments | « ui/views/cocoa/bridged_native_widget.mm ('k') | ui/views/controls/webview/webview_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698