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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 | Annotate | Revision Log
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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller. h" 14 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller. h"
15 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h" 15 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h"
16 #include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
17 #include "chromeos/dbus/ibus/mock_ibus_client.h" 16 #include "chromeos/dbus/ibus/mock_ibus_client.h"
18 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" 17 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
19 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" 18 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
20 #include "chromeos/ime/extension_ime_util.h" 19 #include "chromeos/ime/extension_ime_util.h"
21 #include "chromeos/ime/mock_ibus_daemon_controller.h" 20 #include "chromeos/ime/mock_ibus_daemon_controller.h"
22 #include "chromeos/ime/mock_input_method_delegate.h" 21 #include "chromeos/ime/mock_input_method_delegate.h"
22 #include "chromeos/ime/mock_xkeyboard.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 #include "ui/base/accelerators/accelerator.h" 24 #include "ui/base/accelerators/accelerator.h"
25 #include "ui/base/ime/text_input_test_support.h" 25 #include "ui/base/ime/text_input_test_support.h"
26 #include "ui/base/keycodes/keyboard_codes.h" 26 #include "ui/base/keycodes/keyboard_codes.h"
27 27
28 namespace chromeos { 28 namespace chromeos {
29 29
30 namespace input_method { 30 namespace input_method {
31 namespace { 31 namespace {
32 32
(...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 EXPECT_EQ("mozc", controller_->change_input_method_id_); 1008 EXPECT_EQ("mozc", controller_->change_input_method_id_);
1009 EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count()); 1009 EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
1010 manager_->ChangeInputMethod("xkb:us::eng"); 1010 manager_->ChangeInputMethod("xkb:us::eng");
1011 EXPECT_EQ(2, controller_->change_input_method_count_); 1011 EXPECT_EQ(2, controller_->change_input_method_count_);
1012 EXPECT_EQ("mozc", controller_->change_input_method_id_); 1012 EXPECT_EQ("mozc", controller_->change_input_method_id_);
1013 EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count()); 1013 EXPECT_EQ(1, mock_ibus_input_context_client_->reset_call_count());
1014 } 1014 }
1015 1015
1016 } // namespace input_method 1016 } // namespace input_method
1017 } // namespace chromeos 1017 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698