Unify sidebar identification in the chrome.experimental.sidebar extension API...

chrome/browser/extensions/extension_sidebar_api.cc

 // Copyright (c) 2010 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/browser/extensions/extension_sidebar_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/string16.h"
@@ skipping 58 matching lines @@
     *error = ExtensionErrorUtils::FormatErrorMessage(
         extension_manifest_errors::kCannotAccessPage, url.spec());
   }
 
   return false;
 }
 
 
 // static
 void ExtensionSidebarEventRouter::OnStateChanged(
-    Profile* profile, int tab_id, const std::string& content_id,
+    Profile* profile, TabContents* tab, const std::string& content_id,
     const std::string& state) {
+  int tab_id = ExtensionTabUtil::GetTabId(tab);
   DictionaryValue* details = new DictionaryValue;
   details->Set(kTabIdKey, Value::CreateIntegerValue(tab_id));
   details->Set(kStateKey, Value::CreateStringValue(state));
 
   ListValue args;
   args.Set(0, details);
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   const std::string& extension_id(content_id);
@@ skipping 170 matching lines @@
   SidebarManager::GetInstance()->SetSidebarTitle(tab, content_id, title);
   return true;
 }
 
 bool ShowSidebarFunction::RunImpl(TabContents* tab,
                                   const std::string& content_id,
                                   const DictionaryValue& details) {
   SidebarManager::GetInstance()->ShowSidebar(tab, content_id);
   return true;
 }