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

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

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 years 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 "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" 12 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
13 #include "chrome/browser/chromeos/input_method/input_method_util.h" 13 #include "chrome/browser/chromeos/input_method/input_method_util.h"
14 #include "chromeos/ime/extension_ime_util.h"
15 #include "chromeos/ime/input_method_manager.h"
16 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
17 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
18 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
19 #include "extensions/common/switches.h" 17 #include "extensions/common/switches.h"
20 #include "extensions/browser/api/test/test_api.h" 18 #include "extensions/browser/api/test/test_api.h"
21 #include "extensions/browser/notification_types.h" 19 #include "extensions/browser/notification_types.h"
22 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 #include "ui/base/ime/chromeos/extension_ime_util.h"
22 #include "ui/base/ime/chromeos/input_method_manager.h"
23 23
24 namespace { 24 namespace {
25 25
26 const char kLoginScreenUILanguage[] = "fr"; 26 const char kLoginScreenUILanguage[] = "fr";
27 const char kInitialInputMethodOnLoginScreen[] = "xkb:us::eng"; 27 const char kInitialInputMethodOnLoginScreen[] = "xkb:us::eng";
28 const char kBackgroundReady[] = "ready"; 28 const char kBackgroundReady[] = "ready";
29 29
30 // Class that listens for the JS message. 30 // Class that listens for the JS message.
31 class TestListener : public content::NotificationObserver { 31 class TestListener : public content::NotificationObserver {
32 public: 32 public:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 }; 73 };
74 74
75 } // namespace 75 } // namespace
76 76
77 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) { 77 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) {
78 // Listener for extension's background ready. 78 // Listener for extension's background ready.
79 TestListener listener; 79 TestListener listener;
80 80
81 ASSERT_TRUE(RunExtensionTest("input_method")) << message_; 81 ASSERT_TRUE(RunExtensionTest("input_method")) << message_;
82 } 82 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/input_method_api.cc ('k') | chrome/browser/chromeos/extensions/input_method_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698