Merge 21538 - Stop using strings for NTP logo inversion...

chrome/browser/browser_theme_provider.cc

Index: chrome/browser/browser_theme_provider.cc
===================================================================
--- chrome/browser/browser_theme_provider.cc	(revision 21767)
+++ chrome/browser/browser_theme_provider.cc	(working copy)
@@ -603,9 +603,9 @@
     }
     if (base::strcasecmp(WideToUTF8(*iter).c_str(),
         kDisplayPropertyNTPInverseLogo) == 0) {
-      std::string val;
-      if (display_properties_value->GetString(*iter, &val))
-        display_properties_[kDisplayPropertyNTPInverseLogo] = StringToInt(val);
+      int val = 0;
+      if (display_properties_value->GetInteger(*iter, &val))
+        display_properties_[kDisplayPropertyNTPInverseLogo] = val;
     }
     ++iter;
   }
Property changes on: chrome\browser\browser_theme_provider.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_theme_provider.cc:r21538