chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine_browsertests.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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "base/bind_helpers.h"	5 #include "base/bind_helpers.h"

6 #include "base/strings/stringprintf.h"	6 #include "base/strings/stringprintf.h"

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "chrome/browser/extensions/extension_browsertest.h"	8 #include "chrome/browser/extensions/extension_browsertest.h"

	9 #include "chromeos/ime/component_extension_ime_manager.h"

	10 #include "chromeos/ime/composition_text.h"

	11 #include "chromeos/ime/input_method_descriptor.h"

	12 #include "chromeos/ime/input_method_manager.h"

9 #include "content/public/test/browser_test_utils.h"	13 #include "content/public/test/browser_test_utils.h"

10 #include "content/public/test/test_utils.h"	14 #include "content/public/test/test_utils.h"

11 #include "extensions/browser/process_manager.h"	15 #include "extensions/browser/process_manager.h"

12 #include "extensions/common/manifest_handlers/background_info.h"	16 #include "extensions/common/manifest_handlers/background_info.h"

13 #include "extensions/test/extension_test_message_listener.h"	17 #include "extensions/test/extension_test_message_listener.h"

14 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"

15 #include "ui/base/ime/chromeos/composition_text.h"

16 #include "ui/base/ime/chromeos/ime_bridge.h"	18 #include "ui/base/ime/chromeos/ime_bridge.h"

17 #include "ui/base/ime/chromeos/input_method_descriptor.h"

18 #include "ui/base/ime/chromeos/input_method_manager.h"

19 #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h"	19 #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h"

20 #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h"	20 #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h"

21 #include "ui/base/ime/text_input_flags.h"	21 #include "ui/base/ime/text_input_flags.h"

22 #include "ui/chromeos/ime/input_method_menu_item.h"	22 #include "ui/chromeos/ime/input_method_menu_item.h"

23 #include "ui/chromeos/ime/input_method_menu_manager.h"	23 #include "ui/chromeos/ime/input_method_menu_manager.h"

24 #include "ui/events/event.h"	24 #include "ui/events/event.h"

25	25

26 namespace chromeos {	26 namespace chromeos {

27 namespace input_method {	27 namespace input_method {

28 namespace {	28 namespace {

(...skipping 955 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
984 }	984 }

985 }	985 }

986	986

987 IMEBridge::Get()->SetInputContextHandler(NULL);	987 IMEBridge::Get()->SetInputContextHandler(NULL);

988 IMEBridge::Get()->SetCandidateWindowHandler(NULL);	988 IMEBridge::Get()->SetCandidateWindowHandler(NULL);

989 }	989 }

990	990

991 } // namespace	991 } // namespace

992 } // namespace input_method	992 } // namespace input_method

993 } // namespace chromeos	993 } // namespace chromeos

OLD	NEW