summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_input_method_api.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_input_method_api.cc')
-rw-r--r--chrome/browser/extensions/extension_input_method_api.cc15
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/browser/extensions/extension_input_method_api.cc b/chrome/browser/extensions/extension_input_method_api.cc
index cf2bbd2..040bbbb 100644
--- a/chrome/browser/extensions/extension_input_method_api.cc
+++ b/chrome/browser/extensions/extension_input_method_api.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,12 +10,6 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
-namespace {
-
-const char kErrorInputMethodPrivateApi[] = "Input method API is private";
-
-} // namespace
-
GetInputMethodFunction::GetInputMethodFunction() {
}
@@ -24,15 +18,10 @@ GetInputMethodFunction::~GetInputMethodFunction() {
bool GetInputMethodFunction::RunImpl() {
#if !defined(OS_CHROMEOS)
- error_ = kErrorInputMethodPrivateApi;
- return false;
+ NOTREACHED();
#else
chromeos::ExtensionInputMethodEventRouter* router =
profile_->GetExtensionService()->input_method_event_router();
- if (!router->IsExtensionWhitelisted(extension_id())) {
- error_ = kErrorInputMethodPrivateApi;
- return false;
- }
chromeos::input_method::InputMethodManager* manager =
chromeos::input_method::InputMethodManager::GetInstance();
const std::string input_method =