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

Side by Side Diff: ash/host/ash_window_tree_host_unified.cc

Issue 2909603002: Revert of Remove InputMethodEventHandler. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « ash/host/ash_window_tree_host_platform.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/host/ash_window_tree_host_unified.h" 5 #include "ash/host/ash_window_tree_host_unified.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/host/root_window_transformer.h" 9 #include "ash/host/root_window_transformer.h"
10 #include "ash/ime/input_method_event_handler.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 #include "ui/aura/window_event_dispatcher.h" 14 #include "ui/aura/window_event_dispatcher.h"
14 #include "ui/aura/window_targeter.h" 15 #include "ui/aura/window_targeter.h"
15 #include "ui/compositor/compositor.h" 16 #include "ui/compositor/compositor.h"
16 #include "ui/gfx/geometry/insets.h" 17 #include "ui/gfx/geometry/insets.h"
17 #include "ui/platform_window/stub/stub_window.h" 18 #include "ui/platform_window/stub/stub_window.h"
18 19
19 namespace ash { 20 namespace ash {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 std::find_if(mirroring_hosts_.begin(), mirroring_hosts_.end(), 103 std::find_if(mirroring_hosts_.begin(), mirroring_hosts_.end(),
103 [window](AshWindowTreeHost* ash_host) { 104 [window](AshWindowTreeHost* ash_host) {
104 return ash_host->AsWindowTreeHost()->window() == window; 105 return ash_host->AsWindowTreeHost()->window() == window;
105 }); 106 });
106 DCHECK(iter != mirroring_hosts_.end()); 107 DCHECK(iter != mirroring_hosts_.end());
107 window->RemoveObserver(this); 108 window->RemoveObserver(this);
108 mirroring_hosts_.erase(iter); 109 mirroring_hosts_.erase(iter);
109 } 110 }
110 111
111 } // namespace ash 112 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_platform.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698