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

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h"
8 #include "chrome/browser/extensions/crx_installer.h" 8 #include "chrome/browser/extensions/crx_installer.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_test_notification_observer.h" 10 #include "chrome/browser/extensions/extension_test_notification_observer.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "chromeos/ime/extension_ime_util.h"
15 #include "chromeos/ime/input_method_manager.h"
14 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/site_instance.h" 17 #include "content/public/browser/site_instance.h"
16 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
17 #include "content/public/common/url_constants.h" 19 #include "content/public/common/url_constants.h"
18 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
19 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_system.h"
20 #include "extensions/browser/notification_types.h" 22 #include "extensions/browser/notification_types.h"
21 #include "extensions/common/constants.h" 23 #include "extensions/common/constants.h"
22 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
23 #include "extensions/common/file_util.h" 25 #include "extensions/common/file_util.h"
24 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
25 #include "ui/base/ime/chromeos/extension_ime_util.h"
26 #include "ui/base/ime/chromeos/input_method_manager.h"
27 #include "ui/base/ime/input_method.h" 27 #include "ui/base/ime/input_method.h"
28 28
29 namespace { 29 namespace {
30 30
31 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx"; 31 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx";
32 32
33 const base::FilePath::CharType kInputViewTestDir[] = 33 const base::FilePath::CharType kInputViewTestDir[] =
34 "chromeos/virtual_keyboard/inputview/"; 34 "chromeos/virtual_keyboard/inputview/";
35 const base::FilePath::CharType kBaseKeyboardTestFramework[] = "test_base.js"; 35 const base::FilePath::CharType kBaseKeyboardTestFramework[] = "test_base.js";
36 36
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 107 }
108 108
109 // Disabled for leaking memory: http://crbug.com/380537 109 // Disabled for leaking memory: http://crbug.com/380537
110 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, 110 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest,
111 DISABLED_CompactKeysetTransitionTest) { 111 DISABLED_CompactKeysetTransitionTest) {
112 std::string id = InstallIMEExtension(); 112 std::string id = InstallIMEExtension();
113 ASSERT_FALSE(id.empty()); 113 ASSERT_FALSE(id.empty());
114 RunTest(base::FilePath("keyset_transition_test.js"), 114 RunTest(base::FilePath("keyset_transition_test.js"),
115 InputViewConfig(id, kCompactLayout)); 115 InputViewConfig(id, kCompactLayout));
116 } 116 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/input_method_event_router.h ('k') | chrome/browser/chromeos/input_method/accessibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698