[Panels] Provide a tab id for web contents in Panels.

chrome/browser/ui/panels/panel.cc

 // Copyright (c) 2012 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/ui/panels/panel.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 71 matching lines @@
 
 base::DictionaryValue*
 PanelExtensionWindowController::CreateWindowValueWithTabs(
     const extensions::Extension* extension) const {
   base::DictionaryValue* result = CreateWindowValue();
 
   DCHECK(IsVisibleToExtension(extension));
   content::WebContents* web_contents = panel_->GetWebContents();
   if (web_contents) {
     DictionaryValue* tab_value = new DictionaryValue();
-    // TabId must be >= 0. Use panel session id to avoid conflict with
-    // browser tab ids (which are also session ids).
     tab_value->SetInteger(extensions::tabs_constants::kIdKey,
-                          panel_->session_id().id());
+                          SessionID::IdForTab(web_contents));
     tab_value->SetInteger(extensions::tabs_constants::kIndexKey, 0);
-    tab_value->SetInteger(
-        extensions::tabs_constants::kWindowIdKey, GetWindowId());
+    tab_value->SetInteger(extensions::tabs_constants::kWindowIdKey,
+                          SessionID::IdForWindowContainingTab(web_contents));
     tab_value->SetString(
         extensions::tabs_constants::kUrlKey, web_contents->GetURL().spec());
     tab_value->SetString(extensions::tabs_constants::kStatusKey,
          ExtensionTabUtil::GetTabStatusText(web_contents->IsLoading()));
     tab_value->SetBoolean(
         extensions::tabs_constants::kActiveKey, panel_->IsActive());
     tab_value->SetBoolean(extensions::tabs_constants::kSelectedKey, true);
     tab_value->SetBoolean(extensions::tabs_constants::kHighlightedKey, true);
     tab_value->SetBoolean(extensions::tabs_constants::kPinnedKey, false);
     tab_value->SetString(
@@ skipping 700 matching lines @@
 
 void Panel::OnImageLoaded(const gfx::Image& image,
                           const std::string& extension_id,
                           int index) {
   if (!image.IsEmpty()) {
     app_icon_ = image;
     native_panel_->UpdatePanelTitleBar();
   }
   app_icon_loader_.reset();
 }