Merge 174304

content/browser/hyphenator/hyphenator_message_filter.cc

 // Copyright (c) 2012 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 "base/base_paths.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "content/browser/hyphenator/hyphenator_message_filter.h"
@@ skipping 72 matching lines @@
 }
 
 void HyphenatorMessageFilter::OpenDictionary(const string16& locale) {
   DCHECK(dictionary_file_ == base::kInvalidPlatformFileValue);
 
   if (dictionary_base_.empty()) {
     dictionary_base_ =
         GetContentClient()->browser()->GetHyphenDictionaryDirectory();
   }
   std::string rule_file = locale.empty() ? "en-US" : UTF16ToASCII(locale);
+
+  // Currently, only en-US is hyphenated. This is a quick fix for
+  // http://crbug.com/167122.
+  // TODO(groby): The proper fix entails validating if locale is a properly
+  // formatted locale string, but knowledge about valid locales currently
+  // resides in chrome, not content.
+  if (rule_file != "en-US")
+    return;
   rule_file.append("-1-0.dic");
   FilePath rule_path = dictionary_base_.AppendASCII(rule_file);
   dictionary_file_ = base::CreatePlatformFile(
       rule_path,
       base::PLATFORM_FILE_READ | base::PLATFORM_FILE_OPEN,
       NULL, NULL);
 }
 
 void HyphenatorMessageFilter::SendDictionary() {
   IPC::PlatformFileForTransit file = IPC::InvalidPlatformFileForTransit();
   if (dictionary_file_ != base::kInvalidPlatformFileValue) {
     file = IPC::GetFileHandleForProcess(
         dictionary_file_,
         render_process_host_->GetHandle(),
         false);
   }
   Send(new HyphenatorMsg_SetDictionary(file));
 }
 
 }  // namespace content