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

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

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 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
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 // TODO(nona): move this header from this file.
20 #include "chrome/grit/generated_resources.h"
19 #include "chromeos/ime/component_extension_ime_manager.h" 21 #include "chromeos/ime/component_extension_ime_manager.h"
20 #include "chromeos/ime/extension_ime_util.h" 22 #include "chromeos/ime/extension_ime_util.h"
21 // For SetHardwareKeyboardLayoutForTesting. 23 // For SetHardwareKeyboardLayoutForTesting.
22 #include "chromeos/ime/fake_input_method_delegate.h" 24 #include "chromeos/ime/fake_input_method_delegate.h"
23 #include "chromeos/ime/input_method_delegate.h" 25 #include "chromeos/ime/input_method_delegate.h"
24 #include "chromeos/ime/input_method_whitelist.h" 26 #include "chromeos/ime/input_method_whitelist.h"
25 // TODO(nona): move this header from this file.
26 #include "grit/generated_resources.h"
27 27
28 namespace { 28 namespace {
29 29
30 // A mapping from an input method id to a string for the language indicator. The 30 // A mapping from an input method id to a string for the language indicator. The
31 // mapping is necessary since some input methods belong to the same language. 31 // mapping is necessary since some input methods belong to the same language.
32 // For example, both "xkb:us::eng" and "xkb:us:dvorak:eng" are for US English. 32 // For example, both "xkb:us::eng" and "xkb:us:dvorak:eng" are for US English.
33 const struct { 33 const struct {
34 const char* engine_id; 34 const char* engine_id;
35 const char* indicator_text; 35 const char* indicator_text;
36 } kMappingFromIdToIndicatorText[] = { 36 } kMappingFromIdToIndicatorText[] = {
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 "US", 720 "US",
721 layouts, 721 layouts,
722 languages, 722 languages,
723 true, // login keyboard. 723 true, // login keyboard.
724 GURL(), // options page, not available. 724 GURL(), // options page, not available.
725 GURL()); // input view page, not available. 725 GURL()); // input view page, not available.
726 } 726 }
727 727
728 } // namespace input_method 728 } // namespace input_method
729 } // namespace chromeos 729 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698