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/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" | 9 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" |
10 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" | 10 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 bool GetInputMethodFunction::RunImpl() { | 31 bool GetInputMethodFunction::RunImpl() { |
32 #if !defined(OS_CHROMEOS) | 32 #if !defined(OS_CHROMEOS) |
33 NOTREACHED(); | 33 NOTREACHED(); |
34 return false; | 34 return false; |
35 #else | 35 #else |
36 chromeos::input_method::InputMethodManager* manager = | 36 chromeos::input_method::InputMethodManager* manager = |
37 chromeos::input_method::InputMethodManager::Get(); | 37 chromeos::input_method::InputMethodManager::Get(); |
38 const std::string input_method = InputMethodAPI::GetInputMethodForXkb( | 38 const std::string input_method = InputMethodAPI::GetInputMethodForXkb( |
39 manager->GetCurrentInputMethod().id()); | 39 manager->GetCurrentInputMethod().id()); |
40 SetResult(Value::CreateStringValue(input_method)); | 40 SetResult(base::Value::CreateStringValue(input_method)); |
41 return true; | 41 return true; |
42 #endif | 42 #endif |
43 } | 43 } |
44 | 44 |
45 StartImeFunction::StartImeFunction() { | 45 StartImeFunction::StartImeFunction() { |
46 } | 46 } |
47 | 47 |
48 StartImeFunction::~StartImeFunction() { | 48 StartImeFunction::~StartImeFunction() { |
49 } | 49 } |
50 | 50 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 | 99 |
100 static base::LazyInstance<ProfileKeyedAPIFactory<InputMethodAPI> > | 100 static base::LazyInstance<ProfileKeyedAPIFactory<InputMethodAPI> > |
101 g_factory = LAZY_INSTANCE_INITIALIZER; | 101 g_factory = LAZY_INSTANCE_INITIALIZER; |
102 | 102 |
103 // static | 103 // static |
104 ProfileKeyedAPIFactory<InputMethodAPI>* InputMethodAPI::GetFactoryInstance() { | 104 ProfileKeyedAPIFactory<InputMethodAPI>* InputMethodAPI::GetFactoryInstance() { |
105 return &g_factory.Get(); | 105 return &g_factory.Get(); |
106 } | 106 } |
107 | 107 |
108 } // namespace extensions | 108 } // namespace extensions |
OLD | NEW |