summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/devtools_window.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-12 13:51:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-12 13:51:27 +0000
commitc084925c810975c3050e512c2f4f237d14242f01 (patch)
tree1ec0edb28afdb4717b5f3ea926425ef9658359ed /chrome/browser/debugger/devtools_window.cc
parentaaacb7ce2b2c5bc57393fc863fd8b5e0d2ec5473 (diff)
downloadchromium_src-c084925c810975c3050e512c2f4f237d14242f01.zip
chromium_src-c084925c810975c3050e512c2f4f237d14242f01.tar.gz
chromium_src-c084925c810975c3050e512c2f4f237d14242f01.tar.bz2
browser: Rename Browser::tabstrip_model to Browser::tab_strip_model.
This was a TODO for me in browser.h R=ben@chromium.org TBR=thestig@chromium.org,sky@chromium.org,tim@chromium.org Review URL: https://chromiumcodereview.appspot.com/10388101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_window.cc')
-rw-r--r--chrome/browser/debugger/devtools_window.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 88652fe..6a104ff 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -288,8 +288,8 @@ void DevToolsWindow::Show(DevToolsToggleAction action) {
inspected_window->UpdateDevTools();
tab_contents_->web_contents()->GetView()->SetInitialFocus();
inspected_window->Show();
- TabStripModel* tabstrip_model = inspected_browser->tabstrip_model();
- tabstrip_model->ActivateTabAt(inspected_tab_index, true);
+ TabStripModel* tab_strip_model = inspected_browser->tab_strip_model();
+ tab_strip_model->ActivateTabAt(inspected_tab_index, true);
ScheduleAction(action);
return;
} else {
@@ -334,9 +334,9 @@ void DevToolsWindow::RequestSetDocked(bool docked) {
if (docked) {
// Detach window from the external devtools browser. It will lead to
// the browser object's close and delete. Remove observer first.
- TabStripModel* tabstrip_model = browser_->tabstrip_model();
- tabstrip_model->DetachTabContentsAt(
- tabstrip_model->GetIndexOfTabContents(tab_contents_));
+ TabStripModel* tab_strip_model = browser_->tab_strip_model();
+ tab_strip_model->DetachTabContentsAt(
+ tab_strip_model->GetIndexOfTabContents(tab_contents_));
browser_ = NULL;
} else {
// Update inspected window to hide split and reset it.
@@ -379,7 +379,7 @@ void DevToolsWindow::CreateDevToolsBrowser() {
browser_ = Browser::CreateWithParams(
Browser::CreateParams::CreateForDevTools(profile_));
- browser_->tabstrip_model()->AddTabContents(
+ browser_->tab_strip_model()->AddTabContents(
tab_contents_, -1, content::PAGE_TRANSITION_START_PAGE,
TabStripModel::ADD_ACTIVE);
}