Move session_id.{cc,h} from chrome/browser/sessions to components/sessions

chrome/browser/ui/views/extensions/extension_action_view_controller.cc

 // Copyright 2014 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/views/extensions/extension_action_view_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/views/extensions/extension_action_view_delegate.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 83 matching lines @@
   if (popup_)
     CleanupPopup(true);
 }
 
 gfx::Image ExtensionActionViewController::GetIcon(int tab_id) {
   return icon_factory_.GetIcon(tab_id);
 }
 
 int ExtensionActionViewController::GetCurrentTabId() const {
   content::WebContents* web_contents = delegate_->GetCurrentWebContents();
-  return web_contents ? SessionID::IdForTab(web_contents) : -1;
+  return web_contents ? SessionTabHelper::IdForTab(web_contents) : -1;
 }
 
 void ExtensionActionViewController::RegisterCommand() {
   // If we've already registered, do nothing.
   if (action_keybinding_.get())
     return;
 
   extensions::Command extension_command;
   views::FocusManager* focus_manager =
       delegate_->GetFocusManagerForAccelerator();
@@ skipping 200 matching lines @@
 }
 
 void ExtensionActionViewController::CleanupPopup(bool close_widget) {
   DCHECK(popup_);
   delegate_->CleanupPopup();
   popup_->GetWidget()->RemoveObserver(this);
   if (close_widget)
     popup_->GetWidget()->Close();
   popup_ = NULL;
 }