chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 | « chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

===================================================================

--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (revision 145001)

+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc (working copy)

@@ -12,6 +12,7 @@

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/search/search.h"

#include "chrome/browser/ui/search/search_delegate.h"

#include "chrome/browser/ui/search/search_model.h"

@@ -447,7 +448,7 @@

// repainting of tab's background.

int active_index = GetActiveIndex();

DCHECK_NE(active_index, -1);

- SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index);

+ SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);

}

////////////////////////////////////////////////////////////////////////////////

@@ -459,7 +460,7 @@

// background.

int active_index = GetActiveIndex();

DCHECK_NE(active_index, -1);

- SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index);

+ SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);

}

void BrowserTabStripController::OnToolbarBackgroundAnimatorCanceled(

@@ -477,8 +478,8 @@

GetActiveIndex();

if (index == -1)

return;

- SetTabDataAt(tab_contents ? tab_contents : browser_->GetTabContentsAt(index),

- index);

+ SetTabDataAt(tab_contents ? tab_contents :

+ chrome::GetTabContentsAt(browser_, index), index);

}

////////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »