summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2015-05-05 09:29:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-05 16:31:17 +0000
commit86cfd3347778a31174b1a6dd5032db808e8e8289 (patch)
tree7b254189826fcbb9fe08e706d02a30f03673ebfb /extensions
parent6913c9e026db9028b91b1182dfc11a905f591b09 (diff)
downloadchromium_src-86cfd3347778a31174b1a6dd5032db808e8e8289.zip
chromium_src-86cfd3347778a31174b1a6dd5032db808e8e8289.tar.gz
chromium_src-86cfd3347778a31174b1a6dd5032db808e8e8289.tar.bz2
Don't call InitHost twice
It's already called in CreateHostForPrimaryDisplay. BUG=None Review URL: https://codereview.chromium.org/1122083003 Cr-Commit-Position: refs/heads/master@{#328340}
Diffstat (limited to 'extensions')
-rw-r--r--extensions/shell/browser/shell_desktop_controller_aura.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
index ffa1383..5ab8a3c 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura.cc
@@ -306,7 +306,6 @@ void ShellDesktopControllerAura::CreateRootWindow() {
// TODO(mukai): Set up input method.
host_.reset(screen_->CreateHostForPrimaryDisplay());
- host_->InitHost();
aura::client::SetWindowTreeClient(host_->window(), this);
root_window_event_filter_.reset(new wm::CompoundEventFilter);
host_->window()->AddPreTargetHandler(root_window_event_filter_.get());