Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(824)

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_util.cc

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. 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
OLDNEW
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/input_method/input_method_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "chrome/common/extensions/extension_constants.h" 18 #include "chrome/common/extensions/extension_constants.h"
19
19 // TODO(nona): move this header from this file. 20 // TODO(nona): move this header from this file.
20 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
21 #include "chromeos/ime/component_extension_ime_manager.h" 22
22 #include "chromeos/ime/extension_ime_util.h" 23 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
24 #include "ui/base/ime/chromeos/extension_ime_util.h"
25
23 // For SetHardwareKeyboardLayoutForTesting. 26 // For SetHardwareKeyboardLayoutForTesting.
24 #include "chromeos/ime/fake_input_method_delegate.h" 27 #include "ui/base/ime/chromeos/fake_input_method_delegate.h"
25 #include "chromeos/ime/input_method_delegate.h" 28 #include "ui/base/ime/chromeos/input_method_delegate.h"
26 #include "chromeos/ime/input_method_whitelist.h" 29 #include "ui/base/ime/chromeos/input_method_whitelist.h"
27 30
28 namespace { 31 namespace {
29 32
30 // A mapping from an input method id to a resource id for a 33 // A mapping from an input method id to a resource id for a
31 // medium length language indicator. 34 // medium length language indicator.
32 // For those languages that want to display a slightly longer text in the 35 // For those languages that want to display a slightly longer text in the
33 // "Your input method has changed to..." bubble than in the status tray. 36 // "Your input method has changed to..." bubble than in the status tray.
34 // If an entry is not found in this table the short name is used. 37 // If an entry is not found in this table the short name is used.
35 const struct { 38 const struct {
36 const char* engine_id; 39 const char* engine_id;
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 "US", 624 "US",
622 layouts, 625 layouts,
623 languages, 626 languages,
624 true, // login keyboard. 627 true, // login keyboard.
625 GURL(), // options page, not available. 628 GURL(), // options page, not available.
626 GURL()); // input view page, not available. 629 GURL()); // input view page, not available.
627 } 630 }
628 631
629 } // namespace input_method 632 } // namespace input_method
630 } // namespace chromeos 633 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698