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

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

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/string_util.h"
16 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.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 "chromeos/ime/component_extension_ime_manager.h" 18 #include "chromeos/ime/component_extension_ime_manager.h"
19 #include "chromeos/ime/extension_ime_util.h" 19 #include "chromeos/ime/extension_ime_util.h"
20 #include "chromeos/ime/input_method_delegate.h" 20 #include "chromeos/ime/input_method_delegate.h"
21 // TODO(nona): move this header from this file. 21 // TODO(nona): move this header from this file.
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 23
24 namespace { 24 namespace {
25 25
26 // A mapping from an input method id to a string for the language indicator. The 26 // A mapping from an input method id to a string for the language indicator. The
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 if (iter != id_to_descriptor_.end()) { 701 if (iter != id_to_descriptor_.end()) {
702 const InputMethodDescriptor& input_method = iter->second; 702 const InputMethodDescriptor& input_method = iter->second;
703 language_code_to_ids_.insert( 703 language_code_to_ids_.insert(
704 std::make_pair(language_code, input_method.id())); 704 std::make_pair(language_code, input_method.id()));
705 } 705 }
706 } 706 }
707 } 707 }
708 708
709 } // namespace input_method 709 } // namespace input_method
710 } // namespace chromeos 710 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698