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

Side by Side Diff: chrome/browser/chromeos/options/language_config_model.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/options/language_config_model.h" 5 #include "chrome/browser/chromeos/options/language_config_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "base/string_split.h"
12 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/chromeos/cros/cros_library.h" 14 #include "chrome/browser/chromeos/cros/cros_library.h"
14 #include "chrome/browser/chromeos/cros/input_method_library.h" 15 #include "chrome/browser/chromeos/cros/input_method_library.h"
15 #include "chrome/browser/chromeos/input_method/input_method_util.h" 16 #include "chrome/browser/chromeos/input_method/input_method_util.h"
16 #include "chrome/browser/chromeos/preferences.h" 17 #include "chrome/browser/chromeos/preferences.h"
17 #include "chrome/common/notification_type.h" 18 #include "chrome/common/notification_type.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 21
21 namespace chromeos { 22 namespace chromeos {
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 268 }
268 269
269 // Build the vectors from the sets. 270 // Build the vectors from the sets.
270 supported_language_codes_.assign(supported_language_code_set.begin(), 271 supported_language_codes_.assign(supported_language_code_set.begin(),
271 supported_language_code_set.end()); 272 supported_language_code_set.end());
272 supported_input_method_ids_.assign(supported_input_method_id_set.begin(), 273 supported_input_method_ids_.assign(supported_input_method_id_set.begin(),
273 supported_input_method_id_set.end()); 274 supported_input_method_id_set.end());
274 } 275 }
275 276
276 } // namespace chromeos 277 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/google_authenticator.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698