Multi-tab: Renaming TabStripModel::GetSelectedTabContents to GetActiveTabContents

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2011 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_tabs_module.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 667 matching lines @@
                                         include_incognito(), &error_);
   } else {
     browser = GetCurrentBrowser();
     if (!browser)
       error_ = keys::kNoCurrentWindowError;
   }
   if (!browser)
     return false;
 
   TabStripModel* tab_strip = browser->tabstrip_model();
-  TabContentsWrapper* contents = tab_strip->GetSelectedTabContents();
+  TabContentsWrapper* contents = tab_strip->GetActiveTabContents();
   if (!contents) {
     error_ = keys::kNoSelectedTabError;
     return false;
   }
   result_.reset(ExtensionTabUtil::CreateTabValue(contents->tab_contents(),
       tab_strip,
       tab_strip->active_index()));
   return true;
 }
 
@@ skipping 230 matching lines @@
   bool selected = false;
   // TODO(rafaelw): Setting |selected| from js doesn't make much sense.
   // Move tab selection management up to window.
   if (update_props->HasKey(keys::kSelectedKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
         keys::kSelectedKey,
         &selected));
     if (selected) {
       if (tab_strip->active_index() != tab_index) {
         tab_strip->ActivateTabAt(tab_index, false);
-        DCHECK_EQ(contents, tab_strip->GetSelectedTabContents());
+        DCHECK_EQ(contents, tab_strip->GetActiveTabContents());
       }
       contents->tab_contents()->Focus();
     }
   }
 
   bool pinned = false;
   if (update_props->HasKey(keys::kPinnedKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(keys::kPinnedKey,
                                                          &pinned));
     tab_strip->SetTabPinned(tab_index, pinned);
@@ skipping 347 matching lines @@
     if (!GetTabById(tab_id, profile(), include_incognito(),
                     &browser, NULL, &contents, NULL, &error_)) {
       return false;
     }
     if (!browser || !contents)
       return false;
   } else {
     browser = GetCurrentBrowser();
     if (!browser)
       return false;
-    contents = browser->tabstrip_model()->GetSelectedTabContents();
+    contents = browser->tabstrip_model()->GetActiveTabContents();
     if (!contents)
       return false;
   }
 
   if (contents->controller().needs_reload()) {
     // If the tab hasn't been loaded, don't wait for the tab to load.
     error_ = keys::kCannotDetermineLanguageOfUnloadedTab;
     return false;
   }
 
@@ skipping 32 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }