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

chrome/browser/renderer_host/render_view_host.cc

Index: chrome/browser/renderer_host/render_view_host.cc
===================================================================
--- chrome/browser/renderer_host/render_view_host.cc	(revision 26222)
+++ chrome/browser/renderer_host/render_view_host.cc	(working copy)
@@ -510,8 +510,10 @@
 }
 
 void RenderViewHost::InsertCSSInWebFrame(
-    const std::wstring& frame_xpath, const std::string& css) {
-  Send(new ViewMsg_CSSInsertRequest(routing_id(), frame_xpath, css));
+    const std::wstring& frame_xpath,
+    const std::string& css,
+    const std::string& id) {
+  Send(new ViewMsg_CSSInsertRequest(routing_id(), frame_xpath, css, id));
 }
 
 void RenderViewHost::AddMessageToConsole(
@@ -611,7 +613,7 @@
 }
 
 void RenderViewHost::JavaScriptMessageBoxWindowDestroyed() {
- ResetModalDialogEvent();
+  ResetModalDialogEvent();
 }
 
 void RenderViewHost::ModalHTMLDialogClosed(IPC::Message* reply_msg,
@@ -1111,7 +1113,7 @@
 
 void RenderViewHost::OnDeterminePageTextReply(
     const std::wstring& page_text) {
-#if defined(OS_WIN) // Only for windows.
+#if defined(OS_WIN)  // Only for windows.
     int num_languages = 0;
     bool is_reliable = false;
     const char* language_iso_code = LanguageCodeISO639_1(
@@ -1671,8 +1673,8 @@
 }
 
 void RenderViewHost::ResetModalDialogEvent() {
- if (--modal_dialog_count_ == 0)
-   modal_dialog_event_->Reset();
+  if (--modal_dialog_count_ == 0)
+    modal_dialog_event_->Reset();
 }
 
 void RenderViewHost::UpdateBrowserWindowId(int window_id) {