chrome/browser/ui/ash/ime_controller_chromeos.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/ui/ash/ime_controller_chromeos.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/ui/ash/chrome_shell_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

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/ui/ash/ime_controller_chromeos.h"	5 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"

6	6

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

7 #include "ui/base/accelerators/accelerator.h"	8 #include "ui/base/accelerators/accelerator.h"

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

9	9

10 void ImeController::HandleNextIme() {	10 void ImeController::HandleNextIme() {

11 chromeos::input_method::InputMethodManager* manager =	11 chromeos::input_method::InputMethodManager* manager =

12 chromeos::input_method::InputMethodManager::Get();	12 chromeos::input_method::InputMethodManager::Get();

13 manager->GetActiveIMEState()->SwitchToNextInputMethod();	13 manager->GetActiveIMEState()->SwitchToNextInputMethod();

14 }	14 }

15	15

16 bool ImeController::HandlePreviousIme(const ui::Accelerator& accelerator) {	16 bool ImeController::HandlePreviousIme(const ui::Accelerator& accelerator) {

17 chromeos::input_method::InputMethodManager* manager =	17 chromeos::input_method::InputMethodManager* manager =

18 chromeos::input_method::InputMethodManager::Get();	18 chromeos::input_method::InputMethodManager::Get();

(...skipping 26 matching lines...) Expand all Loading...
45 }	45 }

46	46

47 bool ImeController::UsingFrenchInputMethod() const {	47 bool ImeController::UsingFrenchInputMethod() const {

48 chromeos::input_method::InputMethodManager* manager =	48 chromeos::input_method::InputMethodManager* manager =

49 chromeos::input_method::InputMethodManager::Get();	49 chromeos::input_method::InputMethodManager::Get();

50 const chromeos::input_method::InputMethodDescriptor& descriptor =	50 const chromeos::input_method::InputMethodDescriptor& descriptor =

51 manager->GetActiveIMEState()->GetCurrentInputMethod();	51 manager->GetActiveIMEState()->GetCurrentInputMethod();

52 const std::string& layout = descriptor.id();	52 const std::string& layout = descriptor.id();

53 return (layout == "xkb:fr::fra" \|\| layout == "xkb:be::fra");	53 return (layout == "xkb:fr::fra" \|\| layout == "xkb:be::fra");

54 }	54 }

OLD	NEW