Merge 25834 - Ensure that tips change when the Chrome language changes....

chrome/browser/dom_ui/tips_handler.cc

Index: chrome/browser/dom_ui/tips_handler.cc
===================================================================
--- chrome/browser/dom_ui/tips_handler.cc	(revision 25834)
+++ chrome/browser/dom_ui/tips_handler.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/tips_handler.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/web_resource/web_resource_service.h"
@@ -35,6 +36,20 @@
   int current_tip_index;
   std::string current_tip;
 
+  // If tips are not correct for our locale, 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)) {
+      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) &&
Property changes on: chrome\browser\dom_ui\tips_handler.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/dom_ui/tips_handler.cc:r25834