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

chrome/browser/sidebar/sidebar_manager.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/sidebar/sidebar_manager.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 65 matching lines @@
   SidebarContainer* was_active_host =
       was_active_sidebar_contents == NULL ? NULL :
           FindSidebarContainerFor(was_active_sidebar_contents);
   SidebarContainer* active_host =
       active_sidebar_contents == NULL ? NULL :
           FindSidebarContainerFor(active_sidebar_contents);
 
   if (was_active_host != NULL) {
     ExtensionSidebarEventRouter::OnStateChanged(
         was_active_sidebar_contents->profile(),
-        was_active_host->GetTabId(), was_active_host->content_id(),
+        was_active_host->tab_contents(), was_active_host->content_id(),
         extension_sidebar_constants::kShownState);
   }
 
   if (active_host != NULL) {
     ExtensionSidebarEventRouter::OnStateChanged(
         active_sidebar_contents->profile(),
-        active_host->GetTabId(), active_host->content_id(),
+        active_host->tab_contents(), active_host->content_id(),
         extension_sidebar_constants::kActiveState);
   }
 }
 
 void SidebarManager::ShowSidebar(TabContents* tab,
                                  const std::string& content_id) {
   DCHECK(!content_id.empty());
   SidebarContainer* host = GetSidebarContainerFor(tab, content_id);
   if (!host) {
     host = new SidebarContainer(tab, content_id, this);
     RegisterSidebarContainerFor(tab, host);
   }
 
   host->Show();
 
   ExtensionSidebarEventRouter::OnStateChanged(
-      tab->profile(), host->GetTabId(), content_id,
+      tab->profile(), tab, content_id,
       extension_sidebar_constants::kShownState);
 }
 
 void SidebarManager::ExpandSidebar(TabContents* tab,
                                    const std::string& content_id) {
   DCHECK(!content_id.empty());
   TabToSidebarHostMap::iterator it = tab_to_sidebar_host_.find(tab);
   if (it == tab_to_sidebar_host_.end())
     return;
   // If it's already active, bail out.
@@ skipping 32 matching lines @@
                                  const std::string& content_id) {
   DCHECK(!content_id.empty());
   TabToSidebarHostMap::iterator it = tab_to_sidebar_host_.find(tab);
   if (it == tab_to_sidebar_host_.end())
     return;
   if (it->second.active_content_id == content_id)
     it->second.active_content_id.clear();
 
   SidebarContainer* host = GetSidebarContainerFor(tab, content_id);
   DCHECK(host);
-  int tab_id = host->GetTabId();
 
   UnregisterSidebarContainerFor(tab, content_id);
 
   ExtensionSidebarEventRouter::OnStateChanged(
-      tab->profile(), tab_id, content_id,
+      tab->profile(), tab, content_id,
       extension_sidebar_constants::kHiddenState);
 }
 
 void SidebarManager::NavigateSidebar(TabContents* tab,
                                      const std::string& content_id,
                                      const GURL& url) {
   DCHECK(!content_id.empty());
   SidebarContainer* host = GetSidebarContainerFor(tab, content_id);
   if (!host)
     return;
@@ skipping 135 matching lines @@
 
   DCHECK(GetSidebarContainerFor(tab, content_id) == sidebar_host);
   DCHECK(sidebar_host_to_tab_.find(sidebar_host)->second == tab);
   DCHECK(tab_to_sidebar_host_[tab].active_content_id != content_id);
 
   tab_to_sidebar_host_[tab].content_id_to_sidebar_host.erase(content_id);
   if (tab_to_sidebar_host_[tab].content_id_to_sidebar_host.empty())
     tab_to_sidebar_host_.erase(tab);
   sidebar_host_to_tab_.erase(sidebar_host);
 }