Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: chrome/browser/extensions/extension_tabs_module.cc

Issue 7134026: Multi-tab: Renaming TabStripModel::GetSelectedTabContents to GetActiveTabContents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renaming in tab_strip_controller.mm too. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/tabs/tab_strip_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_tabs_module.cc
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 1c185e2776f77e0149b4d271a82b9f4cfa2bdbfb..8ef378d26f92a6c21daa997516044c64ff3d6bba 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -685,7 +685,7 @@ bool GetSelectedTabFunction::RunImpl() {
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;
@@ -936,7 +936,7 @@ bool UpdateTabFunction::RunImpl() {
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();
}
@@ -1304,7 +1304,7 @@ bool DetectTabLanguageFunction::RunImpl() {
browser = GetCurrentBrowser();
if (!browser)
return false;
- contents = browser->tabstrip_model()->GetSelectedTabContents();
+ contents = browser->tabstrip_model()->GetActiveTabContents();
if (!contents)
return false;
}
« no previous file with comments | « no previous file | chrome/browser/tabs/tab_strip_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698