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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/extensions/input_method_api.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/events/xinput_hierarchy_changed_event_listener.cc ('k') | chrome/browser/chromeos/extensions/input_method_apitest_chromeos.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 (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/extensions/input_method_api.h"	5 #include "chrome/browser/chromeos/extensions/input_method_api.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/lazy_instance.h"	8 #include "base/lazy_instance.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"	10 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"

11 #include "chrome/browser/chromeos/input_method/input_method_util.h"	11 #include "chrome/browser/chromeos/input_method/input_method_util.h"

12 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"	12 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

13 #include "chromeos/chromeos_switches.h"	13 #include "chromeos/chromeos_switches.h"

	14 #include "chromeos/ime/extension_ime_util.h"

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

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

14 #include "extensions/browser/extension_function_registry.h"	17 #include "extensions/browser/extension_function_registry.h"

15 #include "extensions/browser/extension_system.h"	18 #include "extensions/browser/extension_system.h"

16 #include "extensions/common/value_builder.h"	19 #include "extensions/common/value_builder.h"

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

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

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

20	20

21 namespace {	21 namespace {

22	22

23 // Prefix, which is used by XKB.	23 // Prefix, which is used by XKB.

24 const char kXkbPrefix[] = "xkb:";	24 const char kXkbPrefix[] = "xkb:";

25	25

26 } // namespace	26 } // namespace

27	27

28 namespace extensions {	28 namespace extensions {

29	29

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >	141 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >

142 g_factory = LAZY_INSTANCE_INITIALIZER;	142 g_factory = LAZY_INSTANCE_INITIALIZER;

143	143

144 // static	144 // static

145 BrowserContextKeyedAPIFactory<InputMethodAPI>*	145 BrowserContextKeyedAPIFactory<InputMethodAPI>*

146 InputMethodAPI::GetFactoryInstance() {	146 InputMethodAPI::GetFactoryInstance() {

147 return g_factory.Pointer();	147 return g_factory.Pointer();

148 }	148 }

149	149

150 } // namespace extensions	150 } // namespace extensions

OLD	NEW