Allow recommended locales to be set for public sessions

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 221 matching lines @@
   // Concatenate most_relevant_locales_display_names and display_names.
   // Insert special divider in between.
   std::vector<base::string16> out_display_names;
   for (size_t i = 0; i < most_relevant_locales_display_names.size(); ++i) {
     if (most_relevant_locales_display_names[i].size() == 0)
       continue;
     out_display_names.push_back(most_relevant_locales_display_names[i]);
   }
 
   base::string16 divider16;
-  if (insert_divider) {
+  if (insert_divider && !out_display_names.empty()) {
+    // Insert a divider if requested, but only if
+    // |most_relevant_locales_display_names| is not empty.
     divider16 = base::ASCIIToUTF16(kMostRelevantLanguagesDivider);
     out_display_names.push_back(divider16);
   }
 
   std::copy(display_names.begin(),
             display_names.end(),
             std::back_inserter(out_display_names));
 
   // Build the language list from the language map.
   scoped_ptr<base::ListValue> language_list(new base::ListValue());
@@ skipping 212 matching lines @@
 }
 
 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos