Move SessionID, CaptureVisibleTabFunction to WebContents.

chrome/browser/extensions/script_badge_controller.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/extensions/script_badge_controller.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/browser_event_router.h"
@@ skipping 37 matching lines @@
 
 void ScriptBadgeController::GetAttentionFor(
     const std::string& extension_id) {
   ExtensionAction* script_badge = AddExtensionToCurrentActions(extension_id);
   if (!script_badge)
     return;
 
   // TODO(jyasskin): Modify the icon's appearance to indicate that the
   // extension is merely asking for permission to run:
   // http://crbug.com/133142
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
-  script_badge->SetAppearance(SessionID::IdForTab(tab_contents),
+  script_badge->SetAppearance(SessionID::IdForTab(web_contents()),
                               ExtensionAction::WANTS_ATTENTION);
 
   NotifyChange();
 }
 
 LocationBarController::Action ScriptBadgeController::OnClicked(
     const std::string& extension_id, int mouse_button) {
   ExtensionService* service = GetExtensionService();
   if (!service)
     return ACTION_NONE;
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   CHECK(extension);
   ExtensionAction* script_badge = extension->script_badge();
   CHECK(script_badge);
 
   switch (mouse_button) {
     case 1:    // left
     case 2: {  // middle
       extensions::TabHelper::FromWebContents(web_contents())->
           active_tab_permission_manager()->GrantIfRequested(extension);
 
       TabContents* tab_contents = TabContents::FromWebContents(web_contents());
       // Even if clicking the badge doesn't immediately cause the extension to
       // run script on the page, we want to help users associate clicking with
       // the extension having permission to modify the page, so we make the icon
       // full-colored immediately.
-      if (script_badge->SetAppearance(SessionID::IdForTab(tab_contents),
+      if (script_badge->SetAppearance(SessionID::IdForTab(web_contents()),
                                       ExtensionAction::ACTIVE))
         NotifyChange();
 
       // Fire the scriptBadge.onClicked event.
       GetExtensionService()->browser_event_router()->ScriptBadgeExecuted(
           tab_contents->profile(),
           *script_badge,
-          SessionID::IdForTab(tab_contents));
+          SessionID::IdForTab(web_contents()));
 
       // TODO(jyasskin): The fallback order should be user-defined popup ->
       // onClicked handler -> default popup.
       return ACTION_SHOW_SCRIPT_POPUP;
     }
     case 3:  // right
       // Don't grant access on right clicks, so users can investigate
       // the extension without danger.
 
       return extension->ShowConfigureContextMenus() ?
@@ skipping 135 matching lines @@
   current_actions_.push_back(script_badge);
   return script_badge;
 }
 
 bool ScriptBadgeController::MarkExtensionExecuting(
     const std::string& extension_id) {
   ExtensionAction* script_badge = AddExtensionToCurrentActions(extension_id);
   if (!script_badge)
     return false;
 
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
-  script_badge->SetAppearance(SessionID::IdForTab(tab_contents),
+  script_badge->SetAppearance(SessionID::IdForTab(web_contents()),
                               ExtensionAction::ACTIVE);
   return true;
 }
 
 bool ScriptBadgeController::EraseExtension(const Extension* extension) {
   if (extensions_in_current_actions_.erase(extension->id()) == 0)
     return false;
 
   size_t size_before = current_actions_.size();
 
   for (std::vector<ExtensionAction*>::iterator it = current_actions_.begin();
        it != current_actions_.end(); ++it) {
     // Safe to -> the extension action because we still have a handle to the
     // owner Extension.
     //
     // Also note that this means that when extensions are uninstalled their
     // script badges will disappear, even though they're still acting on the
     // page (since they would have already acted).
     if ((*it)->extension_id() == extension->id()) {
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions