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

chrome/common/extensions/extension.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 "chrome/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1864 matching lines @@
       theme_images_.reset(images_value->DeepCopy());
     }
 
     DictionaryValue* colors_value = NULL;
     if (theme_value->GetDictionary(keys::kThemeColors, &colors_value)) {
       // Validate that the colors are RGB or RGBA lists
       for (DictionaryValue::key_iterator iter = colors_value->begin_keys();
            iter != colors_value->end_keys(); ++iter) {
         ListValue* color_list = NULL;
         double alpha = 0.0;
-        int alpha_int = 0;
         int color = 0;
         // The color must be a list
         if (!colors_value->GetListWithoutPathExpansion(*iter, &color_list) ||
             // And either 3 items (RGB) or 4 (RGBA)
             ((color_list->GetSize() != 3) &&
              ((color_list->GetSize() != 4) ||
-              // For RGBA, the fourth item must be a real or int alpha value
-              (!color_list->GetDouble(3, &alpha) &&
-               !color_list->GetInteger(3, &alpha_int)))) ||
+              // For RGBA, the fourth item must be a real or int alpha value.
+              // Note that GetDouble() can get an integer value.
+              !color_list->GetDouble(3, &alpha))) ||
             // For both RGB and RGBA, the first three items must be ints (R,G,B)
             !color_list->GetInteger(0, &color) ||
             !color_list->GetInteger(1, &color) ||
             !color_list->GetInteger(2, &color)) {
           *error = errors::kInvalidThemeColors;
           return false;
         }
       }
       theme_colors_.reset(colors_value->DeepCopy());
     }
 
     DictionaryValue* tints_value = NULL;
     if (theme_value->GetDictionary(keys::kThemeTints, &tints_value)) {
       // Validate that the tints are all reals.
       for (DictionaryValue::key_iterator iter = tints_value->begin_keys();
            iter != tints_value->end_keys(); ++iter) {
         ListValue* tint_list = NULL;
         double v = 0.0;
-        int vi = 0;
         if (!tints_value->GetListWithoutPathExpansion(*iter, &tint_list) ||
             tint_list->GetSize() != 3 ||
-            !(tint_list->GetDouble(0, &v) || tint_list->GetInteger(0, &vi)) ||
-            !(tint_list->GetDouble(1, &v) || tint_list->GetInteger(1, &vi)) ||
-            !(tint_list->GetDouble(2, &v) || tint_list->GetInteger(2, &vi))) {
+            !tint_list->GetDouble(0, &v) ||
+            !tint_list->GetDouble(1, &v) ||
+            !tint_list->GetDouble(2, &v)) {
           *error = errors::kInvalidThemeTints;
           return false;
         }
       }
       theme_tints_.reset(tints_value->DeepCopy());
     }
 
     DictionaryValue* display_properties_value = NULL;
     if (theme_value->GetDictionary(keys::kThemeDisplayProperties,
         &display_properties_value)) {
@@ skipping 1023 matching lines @@
 
 UninstalledExtensionInfo::~UninstalledExtensionInfo() {}
 
 
 UnloadedExtensionInfo::UnloadedExtensionInfo(
     const Extension* extension,
     Reason reason)
   : reason(reason),
     already_disabled(false),
     extension(extension) {}