chrome/browser/extensions/extension_input_method_api.cc - Issue 7649006: more changes

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/extensions/extension_input_method_api.cc

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix another typo Created 9 years, 4 months 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/extension_input_ime_api.cc ('k') | chrome/browser/extensions/extension_input_ui_api.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/extensions/extension_input_method_api.h"	5 #include "chrome/browser/extensions/extension_input_method_api.h"

6	6

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

8 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	8 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

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

10	10

(...skipping 13 matching lines...) Expand all Loading...
24 if (!chromeos::ExtensionInputMethodEventRouter::	24 if (!chromeos::ExtensionInputMethodEventRouter::

25 IsExtensionWhitelisted(extension_id())) {	25 IsExtensionWhitelisted(extension_id())) {

26 error_ = kErrorInputMethodPrivateApi;	26 error_ = kErrorInputMethodPrivateApi;

27 return false;	27 return false;

28 }	28 }

29 chromeos::input_method::InputMethodManager* manager =	29 chromeos::input_method::InputMethodManager* manager =

30 chromeos::input_method::InputMethodManager::GetInstance();	30 chromeos::input_method::InputMethodManager::GetInstance();

31 std::string input_method =	31 std::string input_method =

32 chromeos::ExtensionInputMethodEventRouter::GetInputMethodForXkb(	32 chromeos::ExtensionInputMethodEventRouter::GetInputMethodForXkb(

33 manager->current_input_method().id());	33 manager->current_input_method().id());

34 result_.reset(Value::CreateStringValue(input_method));	34 result_.reset(base::StringValue::New(input_method));

35 return true;	35 return true;

36 }	36 }

OLD	NEW