summaryrefslogtreecommitdiffstats
path: root/ui/keyboard
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-03 16:33:45 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-03 16:33:45 +0000
commitfc2b46bc8a826bbce32c0a1cfef6678aa7b0bb2b (patch)
treefc99a46723b215ce1dcb6e9d0d6a9c859a1317ae /ui/keyboard
parent08bb7500c4583bb641717819ade7af8e520e92cb (diff)
downloadchromium_src-fc2b46bc8a826bbce32c0a1cfef6678aa7b0bb2b.zip
chromium_src-fc2b46bc8a826bbce32c0a1cfef6678aa7b0bb2b.tar.gz
chromium_src-fc2b46bc8a826bbce32c0a1cfef6678aa7b0bb2b.tar.bz2
Hide WebContentsView from Chrome. This also removes WebContentsViewPort.
TestWebContentsView goes away since it's not needed anymore BUG=304341 R=avi@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/262823006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
-rw-r--r--ui/keyboard/keyboard_controller_proxy.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.cc b/ui/keyboard/keyboard_controller_proxy.cc
index 100b3f1..4a0dd4f 100644
--- a/ui/keyboard/keyboard_controller_proxy.cc
+++ b/ui/keyboard/keyboard_controller_proxy.cc
@@ -11,7 +11,6 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
-#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_ui.h"
#include "content/public/common/bindings_policy.h"
#include "ui/aura/layout_manager.h"
@@ -122,7 +121,7 @@ aura::Window* KeyboardControllerProxy::GetKeyboardWindow() {
LoadContents(GetVirtualKeyboardUrl());
}
- return keyboard_contents_->GetView()->GetNativeView();
+ return keyboard_contents_->GetNativeView();
}
bool KeyboardControllerProxy::HasKeyboardWindow() const {