Use new APIs in base/values.h: Value::GetAsNumber and DictionaryValue::GetNumber.

content/browser/host_zoom_map.cc

 // Copyright (c) 2011 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 <cmath>
 
 #include "content/browser/host_zoom_map.h"
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
@@ skipping 44 matching lines @@
   host_zoom_levels_.clear();
   const DictionaryValue* host_zoom_dictionary =
       profile_->GetPrefs()->GetDictionary(prefs::kPerHostZoomLevels);
   // Careful: The returned value could be NULL if the pref has never been set.
   if (host_zoom_dictionary != NULL) {
     for (DictionaryValue::key_iterator i(host_zoom_dictionary->begin_keys());
          i != host_zoom_dictionary->end_keys(); ++i) {
       const std::string& host(*i);
       double zoom_level = 0;
 
-      bool success = host_zoom_dictionary->GetDoubleWithoutPathExpansion(
-          host, &zoom_level);
-      if (!success) {
-        // The data used to be stored as ints, so try that.
-        int int_zoom_level;
-        success = host_zoom_dictionary->GetIntegerWithoutPathExpansion(
-            host, &int_zoom_level);
-        if (success) {
-          zoom_level = static_cast<double>(int_zoom_level);
-          // Since the values were once stored as non-clamped, clamp now.
-          double zoom_factor = WebView::zoomLevelToZoomFactor(zoom_level);
-          if (zoom_factor < WebView::minTextSizeMultiplier) {
-            zoom_level =
-                WebView::zoomFactorToZoomLevel(WebView::minTextSizeMultiplier);
-          } else if (zoom_factor > WebView::maxTextSizeMultiplier) {
-            zoom_level =
-                WebView::zoomFactorToZoomLevel(WebView::maxTextSizeMultiplier);
-          }
+      // The data used to be stored as ints, so try that first. Note that
+      // GetDoubleWithoutPathExpansion supports both Integer and Double values.
+      int int_zoom_level;
+      bool success = host_zoom_dictionary->GetIntegerWithoutPathExpansion(
+          host, &int_zoom_level);
+      if (success) {
+        zoom_level = static_cast<double>(int_zoom_level);
+        // Since the values were once stored as non-clamped, clamp now.
+        double zoom_factor = WebView::zoomLevelToZoomFactor(zoom_level);
+        if (zoom_factor < WebView::minTextSizeMultiplier) {
+          zoom_level =
+              WebView::zoomFactorToZoomLevel(WebView::minTextSizeMultiplier);
+        } else if (zoom_factor > WebView::maxTextSizeMultiplier) {
+          zoom_level =
+              WebView::zoomFactorToZoomLevel(WebView::maxTextSizeMultiplier);
         }
+      } else {
+        success = host_zoom_dictionary->GetDoubleWithoutPathExpansion(

[jam, 2011/05/02 16:17:04]

why not only call GetDoubleWithoutPathExpansion?  for the old-profile code, it
will do the casting internally.

we can also get rid of the code from line 75-82, since that was just needed for
converting old profiles.  this new way of storing zoom values has been like this
for several releases already, so I don't think we need to convert anymore.

[Yusuke Sato, 2011/05/04 14:10:10]

Done. Removed the old code.

+            host, &zoom_level);
       }
       DCHECK(success);
       host_zoom_levels_[host] = zoom_level;
     }
   }
 }
 
 // static
 void HostZoomMap::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, 0.0);
@@ skipping 143 matching lines @@
       break;
     }
     default:
       NOTREACHED() << "Unexpected preference observed.";
   }
 }
 
 HostZoomMap::~HostZoomMap() {
   Shutdown();
 }