diff options
| author | Shu Chen <shuchen@google.com> | 2015-07-13 10:03:46 +0800 |
|---|---|---|
| committer | Shu Chen <shuchen@google.com> | 2015-07-13 02:04:45 +0000 |
| commit | 5b3188763b9419ec2c3ab1a87a067ee07bb027e6 (patch) | |
| tree | a425fc07e4ca44dff4773feb4782b4d11c2dd639 | |
| parent | 02f087426ff0c7a6ab065937895f6c879f525fc3 (diff) | |
| download | chromium_src-5b3188763b9419ec2c3ab1a87a067ee07bb027e6.zip chromium_src-5b3188763b9419ec2c3ab1a87a067ee07bb027e6.tar.gz chromium_src-5b3188763b9419ec2c3ab1a87a067ee07bb027e6.tar.bz2 | |
Revert "Makes sure singleton ui::InputMethod instance under unified desktop mode."
Reason: broke M44 builds.
This reverts commit 02f087426ff0c7a6ab065937895f6c879f525fc3.
BUG=502113, 505201
Review URL: https://codereview.chromium.org/1225093009.
Cr-Commit-Position: refs/branch-heads/2403@{#492}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
| -rw-r--r-- | ash/display/display_controller.h | 3 | ||||
| -rw-r--r-- | ash/display/mirror_window_controller.cc | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h index 0eb9121..bb476ef 100644 --- a/ash/display/display_controller.h +++ b/ash/display/display_controller.h @@ -147,9 +147,6 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver, // Sets the work area's |insets| to the display assigned to |window|. bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window, const gfx::Insets& insets); - - ui::InputMethod* input_method() { return input_method_.get(); } - // gfx::DisplayObserver overrides: void OnDisplayAdded(const gfx::Display& display) override; void OnDisplayRemoved(const gfx::Display& display) override; diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index b2800d1..b7e2a11d 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc @@ -190,8 +190,6 @@ void MirrorWindowController::UpdateWindow( mirroring_host_info_map_[display_info.id()] = host_info; aura::WindowTreeHost* host = host_info->ash_host->AsWindowTreeHost(); - host->SetSharedInputMethod( - Shell::GetInstance()->display_controller()->input_method()); host->window()->SetName( base::StringPrintf("MirrorRootWindow-%d", mirror_host_count++)); host->compositor()->SetBackgroundColor(SK_ColorBLACK); |