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

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

Issue 61003004: Delete ibus_object and move ibus_text to chromeos/ime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modified based on the review. Created 7 years, 1 month 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/base/ime/input_method_ibus.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <X11/Xlib.h> 5 #include <X11/Xlib.h>
6 #undef Bool 6 #undef Bool
7 #undef FocusIn 7 #undef FocusIn
8 #undef FocusOut 8 #undef FocusOut
9 #undef None 9 #undef None
10 10
11 #include <cstring> 11 #include <cstring>
12 12
13 #include "base/i18n/char_iterator.h" 13 #include "base/i18n/char_iterator.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chromeos/dbus/dbus_thread_manager.h" 16 #include "chromeos/dbus/dbus_thread_manager.h"
17 #include "chromeos/dbus/ibus/ibus_text.h"
18 #include "chromeos/ime/ibus_bridge.h" 17 #include "chromeos/ime/ibus_bridge.h"
19 #include "chromeos/ime/ibus_keymap.h" 18 #include "chromeos/ime/ibus_keymap.h"
19 #include "chromeos/ime/ibus_text.h"
20 #include "chromeos/ime/mock_ime_candidate_window_handler.h" 20 #include "chromeos/ime/mock_ime_candidate_window_handler.h"
21 #include "chromeos/ime/mock_ime_engine_handler.h" 21 #include "chromeos/ime/mock_ime_engine_handler.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 #include "ui/base/ime/input_method_delegate.h" 23 #include "ui/base/ime/input_method_delegate.h"
24 #include "ui/base/ime/input_method_ibus.h" 24 #include "ui/base/ime/input_method_ibus.h"
25 #include "ui/base/ime/text_input_client.h" 25 #include "ui/base/ime/text_input_client.h"
26 #include "ui/events/event.h" 26 #include "ui/events/event.h"
27 #include "ui/events/x/events_x_utils.h" 27 #include "ui/events/x/events_x_utils.h"
28 #include "ui/gfx/rect.h" 28 #include "ui/gfx/rect.h"
29 29
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 ime_->ResetContext(); 1026 ime_->ResetContext();
1027 1027
1028 // Do callback. 1028 // Do callback.
1029 mock_ime_engine_handler_->last_passed_callback().Run(true); 1029 mock_ime_engine_handler_->last_passed_callback().Run(true);
1030 1030
1031 EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count()); 1031 EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count());
1032 } 1032 }
1033 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593). 1033 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
1034 1034
1035 } // namespace ui 1035 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_ibus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698