summaryrefslogtreecommitdiffstats
path: root/content/shell/browser/shell_aura.cc
diff options
context:
space:
mode:
authorspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 09:02:59 +0000
committerspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 09:02:59 +0000
commit01902bb7d66979cd56c68c553254cc0d6c5feb54 (patch)
tree07c641ae597b47503e398f8779c444a4aea206a7 /content/shell/browser/shell_aura.cc
parentf757c1ae7b770f3d7ba95e791f6e69e6f6eb98e1 (diff)
downloadchromium_src-01902bb7d66979cd56c68c553254cc0d6c5feb54.zip
chromium_src-01902bb7d66979cd56c68c553254cc0d6c5feb54.tar.gz
chromium_src-01902bb7d66979cd56c68c553254cc0d6c5feb54.tar.bz2
Use gfx::kNullAcceleratedWidget for ui::CreateInputMethod in MinimalInputEventFilter
This fixes the build when AcceleratedWidget is not a pointer type. Review URL: https://codereview.chromium.org/62903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell_aura.cc')
-rw-r--r--content/shell/browser/shell_aura.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc
index c2f22a1..bf9a5fd 100644
--- a/content/shell/browser/shell_aura.cc
+++ b/content/shell/browser/shell_aura.cc
@@ -68,7 +68,8 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
public:
explicit MinimalInputEventFilter(aura::RootWindow* root)
: root_(root),
- input_method_(ui::CreateInputMethod(this, NULL)) {
+ input_method_(ui::CreateInputMethod(this,
+ gfx::kNullAcceleratedWidget)) {
input_method_->Init(true);
root_->AddPreTargetHandler(this);
root_->SetProperty(aura::client::kRootWindowInputMethodKey,