Fix tips in OS X to respect system language settings instead of locale....

chrome/browser/dom_ui/tips_handler.cc

 // Copyright (c) 2009 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 <string>
 
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/tips_handler.h"
@@ skipping 10 matching lines @@
       GetMutableDictionary(prefs::kNTPTipsCache);
   return DOMMessageHandler::Attach(dom_ui);
 }
 
 void TipsHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("getTips",
       NewCallback(this, &TipsHandler::HandleGetTips));
 }
 
 void TipsHandler::HandleGetTips(const Value* content) {
-  // List containing the tips to be displayed.
+  // List containing the tips to be displayed.
   ListValue list_value;
 
   // Holds the web resource data found in the preferences cache.
   ListValue* wr_list;
 
   // These values hold the data for each web resource item.
   int current_tip_index;
   std::string current_tip;
 
-  // If tips are not correct for our locale, do not send.  Wait for update.
+  // If tips are not correct for our language, do not send.  Wait for update.
   // We need to check here because the new tab page calls for tips before
   // the tip service starts up.
   PrefService* current_prefs = dom_ui_->GetProfile()->GetPrefs();
   if (current_prefs->HasPrefPath(prefs::kNTPTipsServer)) {
     std::wstring server = current_prefs->GetString(prefs::kNTPTipsServer);
-    std::wstring locale = ASCIIToWide(
-        g_browser_process->GetApplicationLocale());
-    if (!EndsWith(server, locale, false)) {
+    std::wstring tips_language = WebResourceService::GetWebResourceLanguage(
+        current_prefs);
+    if (!EndsWith(server, tips_language, false)) {
       dom_ui_->CallJavascriptFunction(L"tips", list_value);
       return;
     }
   }
 
   if (tips_cache_ != NULL && tips_cache_->GetSize() != 0) {
     if (tips_cache_->GetInteger(
         WebResourceService::kCurrentTipPrefName, &current_tip_index) &&
         tips_cache_->GetList(
         WebResourceService::kTipCachePrefName, &wr_list) &&
@@ skipping 19 matching lines @@
   prefs->RegisterDictionaryPref(prefs::kNTPTipsCache);
   prefs->RegisterStringPref(prefs::kNTPTipsServer,
                             WebResourceService::kDefaultResourceServer);
 }
 
 bool TipsHandler::IsValidURL(const std::wstring& url_string) {
   GURL url(WideToUTF8(url_string));
   return !url.is_empty() && (url.SchemeIs(chrome::kHttpScheme) ||
                              url.SchemeIs(chrome::kHttpsScheme));
 }