ExtensionShelf now uses the BookmarkExtensionBackground, just like the Bookma...

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 683 matching lines @@
   // Returns the V8 context for this frame, or an empty handle if there is
   // none.
 v8::Local<v8::Context> WebFrameImpl::mainWorldScriptContext() const {
   if (!frame_)
     return v8::Local<v8::Context>();
 
   return WebCore::V8Proxy::mainWorldContext(frame_);
 }
 #endif
 
-bool WebFrameImpl::insertStyleText(const WebString& css) {
+bool WebFrameImpl::insertStyleText(
+    const WebString& css, const WebString& id) {
   Document* document = frame()->document();
   if (!document)
     return false;
   WebCore::Element* document_element = document->documentElement();
   if (!document_element)
     return false;
 
+  ExceptionCode err = 0;
+
+  if (!id.isEmpty()) {
+    WebCore::Element* old_element =
+        document->getElementById(webkit_glue::WebStringToString(id));
+    if (old_element) {
+      Node* parent = old_element->parent();
+      if (!parent)
+        return false;
+      parent->removeChild(old_element, err);
+    }
+  }
+
   RefPtr<WebCore::Element> stylesheet = document->createElement(
       WebCore::HTMLNames::styleTag, false);
-  ExceptionCode err = 0;
+  if (!id.isEmpty())
+    stylesheet->setAttribute(WebCore::HTMLNames::idAttr,
+                             webkit_glue::WebStringToString(id));
   stylesheet->setTextContent(webkit_glue::WebStringToString(css), err);
   DCHECK(!err) << "Failed to set style element content";
   WebCore::Node* first = document_element->firstChild();
   bool success = document_element->insertBefore(stylesheet, first, err);
   DCHECK(success) << "Failed to insert stylesheet";
   return success;
 }
 
 void WebFrameImpl::reload() {
   frame_->loader()->saveDocumentAndScrollState();
@@ skipping 1157 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }