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

Side by Side Diff: chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc

Issue 2919583002: chromeos: Move InputMethodUtil into //ui/base/ime/chromeos (Closed)
Patch Set: Created 3 years, 6 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
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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" 11 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
12 #include "chrome/browser/chromeos/input_method/input_method_util.h"
13 #include "chrome/common/chrome_features.h" 12 #include "chrome/common/chrome_features.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
15 #include "chromeos/chromeos_switches.h" 14 #include "chromeos/chromeos_switches.h"
16 #include "components/prefs/pref_service.h" 15 #include "components/prefs/pref_service.h"
17 #include "content/public/browser/notification_observer.h" 16 #include "content/public/browser/notification_observer.h"
18 #include "content/public/browser/notification_registrar.h" 17 #include "content/public/browser/notification_registrar.h"
19 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
20 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
21 #include "extensions/common/switches.h"
22 #include "extensions/browser/api/test/test_api.h" 20 #include "extensions/browser/api/test/test_api.h"
23 #include "extensions/browser/notification_types.h" 21 #include "extensions/browser/notification_types.h"
22 #include "extensions/common/switches.h"
24 #include "extensions/test/extension_test_message_listener.h" 23 #include "extensions/test/extension_test_message_listener.h"
25 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
26 #include "ui/base/ime/chromeos/extension_ime_util.h" 25 #include "ui/base/ime/chromeos/extension_ime_util.h"
27 #include "ui/base/ime/chromeos/input_method_manager.h" 26 #include "ui/base/ime/chromeos/input_method_manager.h"
27 #include "ui/base/ime/chromeos/input_method_util.h"
28 #include "ui/base/ime/chromeos/input_method_whitelist.h" 28 #include "ui/base/ime/chromeos/input_method_whitelist.h"
29 #include "ui/base/ime/ime_bridge.h" 29 #include "ui/base/ime/ime_bridge.h"
30 30
31 using namespace chromeos::input_method; 31 using namespace chromeos::input_method;
32 32
33 namespace { 33 namespace {
34 34
35 const char kLoginScreenUILanguage[] = "fr"; 35 const char kLoginScreenUILanguage[] = "fr";
36 const char kInitialInputMethodOnLoginScreen[] = "xkb:us::eng"; 36 const char kInitialInputMethodOnLoginScreen[] = "xkb:us::eng";
37 const char kBackgroundReady[] = "ready"; 37 const char kBackgroundReady[] = "ready";
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 ASSERT_TRUE(activated_listener.WaitUntilSatisfied()) << message_; 145 ASSERT_TRUE(activated_listener.WaitUntilSatisfied()) << message_;
146 ASSERT_TRUE(menu_listener.WaitUntilSatisfied()) << message_; 146 ASSERT_TRUE(menu_listener.WaitUntilSatisfied()) << message_;
147 ASSERT_TRUE(item_activated_listenter.WaitUntilSatisfied()) << message_; 147 ASSERT_TRUE(item_activated_listenter.WaitUntilSatisfied()) << message_;
148 148
149 InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod( 149 InputMethodManager::Get()->GetActiveIMEState()->ChangeInputMethod(
150 kTestIMEID2, false /* show_message */); 150 kTestIMEID2, false /* show_message */);
151 engine_handler->Enable("test2"); 151 engine_handler->Enable("test2");
152 ASSERT_TRUE(list_listenter.WaitUntilSatisfied()) << message_; 152 ASSERT_TRUE(list_listenter.WaitUntilSatisfied()) << message_;
153 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/input_method_api.cc ('k') | chrome/browser/chromeos/input_method/accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698