update chome.tabs api

add additional tab properties to tab helper
auditors: @bbondy @jonathansampson

Author: bridiver

atom/browser/api/atom_api_web_contents.cc

@@ -1586,6 +1586,14 @@ bool WebContents::ExecuteScriptInTab(mate::Arguments* args) {
 
   return tab_helper->ExecuteScriptInTab(args);
 }
+
+void WebContents::SetTabValues(const base::DictionaryValue& values) {
+  auto tab_helper = extensions::TabHelper::FromWebContents(web_contents());
+  if (!tab_helper)
+    return;
+
+  return tab_helper->SetTabValues(values);
+}
 #endif
 
 void WebContents::TabTraverse(bool reverse) {
@@ -2034,6 +2042,7 @@ void WebContents::BuildPrototype(v8::Isolate* isolate,
                   &WebContents::EnablePreferredSizeMode)
 #if defined(ENABLE_EXTENSIONS)
       .SetMethod("executeScriptInTab", &WebContents::ExecuteScriptInTab)
+      .SetMethod("setTabValues", &WebContents::SetTabValues)
 #endif
       .SetMethod("autofillSelect", &WebContents::AutofillSelect)
       .SetMethod("autofillPopupHidden", &WebContents::AutofillPopupHidden)

atom/browser/api/atom_api_web_contents.h

@@ -195,6 +195,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
 #if defined(ENABLE_EXTENSIONS)
   bool ExecuteScriptInTab(mate::Arguments* args);
+  void SetTabValues(const base::DictionaryValue& values);
 #endif
 
   // Send messages to browser.

atom/browser/extensions/tab_helper.cc

@@ -37,7 +37,9 @@ const char kWindowIdKey[] = "windowId";
 const char kTitleKey[] = "title";
 const char kUrlKey[] = "url";
 const char kStatusKey[] = "status";
-}
+const char kAudibleKey[] = "audible";
+const char kMutedKey[] = "muted";
+}  // namespace keys
 
 static std::map<int, std::pair<int, int>> render_view_map_;
 static std::map<int, int> active_tab_map_;
@@ -47,6 +49,7 @@ namespace extensions {
 
 TabHelper::TabHelper(content::WebContents* contents)
     : content::WebContentsObserver(contents),
+      values_(new base::DictionaryValue),
       script_executor_(
           new ScriptExecutor(contents, &script_execution_observers_)) {
   session_id_ = next_id++;
@@ -75,6 +78,10 @@ void TabHelper::SetActive(bool active) {
     active_tab_map_[window_id_] = -1;
 }
 
+void TabHelper::SetTabValues(const base::DictionaryValue& values) {
+  values_->MergeDictionary(&values);
+}
+
 void TabHelper::RenderViewCreated(content::RenderViewHost* render_view_host) {
   render_view_map_[session_id_] = std::make_pair(
       render_view_host->GetProcess()->GetID(),
@@ -264,8 +271,10 @@ base::DictionaryValue* TabHelper::CreateTabValue(
                                               content::WebContents* contents) {
   auto tab_id = IdForTab(contents);
   auto window_id = IdForWindowContainingTab(contents);
+  auto tab_helper = TabHelper::FromWebContents(contents);
 
-  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> result(
+      tab_helper->getTabValues()->CreateDeepCopy());
 
   result->SetInteger(keys::kIdKey, tab_id);
   result->SetInteger(keys::kTabIdKey, tab_id);
@@ -277,6 +286,8 @@ base::DictionaryValue* TabHelper::CreateTabValue(
   result->SetString(keys::kTitleKey, contents->GetTitle());
   result->SetString(keys::kStatusKey, contents->IsLoading()
       ? "loading" : "complete");
+  result->SetBoolean(keys::kAudibleKey, contents->WasRecentlyAudible());
+  result->SetBoolean(keys::kMutedKey, contents->IsAudioMuted());
   return result.release();
 }
 

atom/browser/extensions/tab_helper.h

@@ -33,6 +33,8 @@ extern const char kIdKey[];
 extern const char kTabIdKey[];
 extern const char kIncognitoKey[];
 extern const char kWindowIdKey[];
+extern const char kAudibleKey[];
+extern const char kMutedKey[];
 }
 
 namespace extensions {
@@ -57,6 +59,11 @@ class TabHelper : public content::WebContentsObserver,
   // Set this tab as the active tab in its window
   void SetActive(bool active);
 
+  void SetTabValues(const base::DictionaryValue& values);
+  base::DictionaryValue* getTabValues() {
+    return values_.get();
+  }
+
   bool ExecuteScriptInTab(mate::Arguments* args);
 
   ScriptExecutor* script_executor() {
@@ -112,6 +119,7 @@ class TabHelper : public content::WebContentsObserver,
   // Unique identifier of the window the tab is in.
   int32_t window_id_ = -1;
 
+  std::unique_ptr<base::DictionaryValue> values_;
   std::unique_ptr<ScriptExecutor> script_executor_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);

atom/common/api/resources/tabs_bindings.js

@@ -137,7 +137,15 @@ var bindings = {
     ipc.once('chrome-tabs-get-response-' + responseId, function (evt, tab) {
       cb(tab)
     })
-    ipc.send('chrome-tabs-get', responseId, {})
+    ipc.send('chrome-tabs-get', responseId, tabId)
+  },
+
+  getCurrent: function(cb) {
+    var responseId = ++id
+    ipc.once('chrome-tabs-get-current-response-' + responseId, function (evt, tab) {
+      cb(tab)
+    })
+    ipc.send('chrome-tabs-get-current', responseId)
   },
 
   query: function(queryInfo, cb) {

lib/browser/api/extensions.js

@@ -441,6 +441,11 @@ ipcMain.on('chrome-tabs-remove', function (evt, responseId, tabIds) {
   evt.sender.send('chrome-tabs-remove-' + responseId)
 })
 
+ipcMain.on('chrome-tabs-get-current', function (evt, responseId) {
+  var response = getTabValue(evt.sender.getId())
+  evt.sender.send('chrome-tabs-get-current-response-' + responseId, response)
+})
+
 ipcMain.on('chrome-tabs-get', function (evt, responseId, tabId) {
   var response = getTabValue(tabId)
   evt.sender.send('chrome-tabs-get-response-' + responseId, response)