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

Side by Side Diff: ui/base/ime/input_method_auralinux.cc

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
Patch Set: Rebase again + presubmit fix Created 4 years, 3 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 | « ui/android/delegated_frame_host_android.cc ('k') | ui/base/ime/input_method_win.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/base/ime/input_method_auralinux.h" 5 #include "ui/base/ime/input_method_auralinux.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h"
8 #include "base/environment.h" 9 #include "base/environment.h"
9 #include "ui/base/ime/ime_bridge.h" 10 #include "ui/base/ime/ime_bridge.h"
10 #include "ui/base/ime/ime_engine_handler_interface.h" 11 #include "ui/base/ime/ime_engine_handler_interface.h"
11 #include "ui/base/ime/linux/linux_input_method_context_factory.h" 12 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
12 #include "ui/base/ime/text_input_client.h" 13 #include "ui/base/ime/text_input_client.h"
13 #include "ui/events/event.h" 14 #include "ui/events/event.h"
14 15
15 namespace { 16 namespace {
16 17
17 ui::IMEEngineHandlerInterface* GetEngine() { 18 ui::IMEEngineHandlerInterface* GetEngine() {
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 client->ConfirmCompositionText(); 448 client->ConfirmCompositionText();
448 449
449 if (GetEngine()) 450 if (GetEngine())
450 GetEngine()->Reset(); 451 GetEngine()->Reset();
451 } 452 }
452 453
453 ResetContext(); 454 ResetContext();
454 } 455 }
455 456
456 } // namespace ui 457 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/delegated_frame_host_android.cc ('k') | ui/base/ime/input_method_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698