add mole info to toolstrip definition and enable moles

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 731 matching lines @@
 
   // Initialize toolstrips (optional).
   if (source.HasKey(keys::kToolstrips)) {
     ListValue* list_value;
     if (!source.GetList(keys::kToolstrips, &list_value)) {
       *error = errors::kInvalidToolstrips;
       return false;
     }
 
     for (size_t i = 0; i < list_value->GetSize(); ++i) {
-      std::string toolstrip;
-      if (!list_value->GetString(i, &toolstrip)) {
+      ToolstripInfo toolstrip;
+      DictionaryValue* toolstrip_value;
+      std::string toolstrip_path;
+      if (list_value->GetString(i, &toolstrip_path)) {

[Matt Perry, 2009/07/24 23:11:11]

is this temporary for back compat, or do you plan on leaving this here
permanently?  if temporary, add a TODO.

[Erik does not do reviews, 2009/07/26 00:34:46]

It's unclear.  I added a comment with a TODO to look at this later.

+        toolstrip.toolstrip = GetResourceURL(toolstrip_path);
+      } else if (list_value->GetDictionary(i, &toolstrip_value)) {
+        if (!toolstrip_value->GetString(keys::kToolstripPath,
+                                        &toolstrip_path)) {
+          *error = ExtensionErrorUtils::FormatErrorMessage(
+              errors::kInvalidToolstrip, IntToString(i));
+          return false;
+        }
+        toolstrip.toolstrip = GetResourceURL(toolstrip_path);
+        if (toolstrip_value->HasKey(keys::kToolstripMolePath)) {
+          std::string mole_path;
+          if (!toolstrip_value->GetString(keys::kToolstripMolePath,
+                                          &mole_path)) {
+            *error = ExtensionErrorUtils::FormatErrorMessage(
+                errors::kInvalidToolstrip, IntToString(i));
+            return false;
+          }
+          // TODO(erikkay) is there a better way to get this dynamically
+          // from the content itself?
+          int height;
+          if (!toolstrip_value->GetInteger(keys::kToolstripMoleHeight,
+                                           &height) || (height < 0)) {
+            *error = ExtensionErrorUtils::FormatErrorMessage(
+                errors::kInvalidToolstrip, IntToString(i));
+            return false;
+          }
+          toolstrip.mole = GetResourceURL(mole_path);
+          toolstrip.mole_height = height;
+        }
+      } else {
         *error = ExtensionErrorUtils::FormatErrorMessage(
             errors::kInvalidToolstrip, IntToString(i));
         return false;
       }
       toolstrips_.push_back(toolstrip);
     }
   }
 
   // Initialize content scripts (optional).
   if (source.HasKey(keys::kContentScripts)) {
@@ skipping 113 matching lines @@
        it != page_actions().end(); ++it) {
     const std::vector<FilePath>& icon_paths = it->second->icon_paths();
     for (std::vector<FilePath>::const_iterator iter = icon_paths.begin();
          iter != icon_paths.end(); ++iter) {
       image_paths.insert(*iter);
     }
   }
 
   return image_paths;
 }