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

chrome/browser/browser_theme_provider.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 "chrome/browser/browser_theme_provider.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 585 matching lines @@
             StringToAlignment(val);
     } else if (base::strcasecmp(WideToUTF8(*iter).c_str(),
                kDisplayPropertyNTPTiling) == 0) {
       std::string val;
       if (display_properties_value->GetString(*iter, &val))
         display_properties_[kDisplayPropertyNTPTiling] =
             StringToTiling(val);
     }
     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;
   }
 }
 
 // static
 int BrowserThemeProvider::StringToAlignment(const std::string& alignment) {
   std::vector<std::wstring> split;
   SplitStringAlongWhitespace(UTF8ToWide(alignment), &split);
 
@@ skipping 327 matching lines @@
     delete i->second;
   }
   image_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif