add mole collapse/expand events. convert mappy to use this.

BUG=15494
TEST=browser_tests.exe --gtest_filter=ExtensionApiTest.Toolstrip

Review URL: http://codereview.chromium.org/203023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25976 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 0 deletions

diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 8aaa2f2..7a9d0ac 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -106,6 +106,8 @@ class ExtensionImpl : public ExtensionBase {
       return v8::FunctionTemplate::New(GetCurrentPageActions);
     } else if (name->Equals(v8::String::New("StartRequest"))) {
       return v8::FunctionTemplate::New(StartRequest);
+    } else if (name->Equals(v8::String::New("GetRenderViewId"))) {
+      return v8::FunctionTemplate::New(GetRenderViewId);
     }
 
     return ExtensionBase::GetNativeFunction(name);
@@ -268,6 +270,13 @@ class ExtensionImpl : public ExtensionBase {
 
     return v8::Undefined();
   }
+
+  static v8::Handle<v8::Value> GetRenderViewId(const v8::Arguments& args) {
+    RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
+    if (!renderview)
+      return v8::Undefined();
+    return v8::Integer::New(renderview->routing_id());
+  }
 };
 
 }  // namespace
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 4312d04..657baec 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -19,6 +19,7 @@ var chrome = chrome || {};
   native function GetChromeHidden();
   native function GetNextRequestId();
   native function OpenChannelToTab();
+  native function GetRenderViewId();
 
   if (!chrome)
     chrome = {};
@@ -182,6 +183,14 @@ var chrome = chrome || {};
     }
   }
 
+  function setupToolstripEvents(renderViewId) {
+    chrome.toolstrip = chrome.toolstrip || {};
+    chrome.toolstrip.onExpanded =
+        new chrome.Event("toolstrip.onExpanded." + renderViewId);
+    chrome.toolstrip.onCollapsed =
+        new chrome.Event("toolstrip.onCollapsed." + renderViewId);
+  }
+
   chromeHidden.onLoad.addListener(function (extensionId) {
     chrome.extension = new chrome.Extension(extensionId);
 
@@ -298,5 +307,6 @@ var chrome = chrome || {};
     }
 
     setupPageActionEvents(extensionId);
+    setupToolstripEvents(GetRenderViewId());
   });
 })();