chrome/browser/ui/views/toolbar_view.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/toolbar_view.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/tabs/browser_tab_strip_controller.cc ('k') | chrome/browser/ui/views/web_dialog_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar_view.cc

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

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

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

@@ -16,6 +16,7 @@

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

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

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

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

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

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

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

@@ -426,7 +427,7 @@

// ToolbarView, LocationBarView::Delegate implementation:

TabContents* ToolbarView::GetTabContents() const {

- return browser_->GetActiveTabContents();

+ return chrome::GetActiveTabContents(browser_);

}

InstantController* ToolbarView::GetInstant() {

@@ -929,7 +930,7 @@

void ToolbarView::LayoutLocationBarNTP() {

// TODO(kuan): this likely needs to cancel animations.

- WebContents* contents = browser_->GetActiveWebContents();

+ WebContents* contents = chrome::GetActiveWebContents(browser_);

#if defined(USE_AURA)

// Under aura we can't use WebContentsView::GetContainerBounds since it is

// affected by any animations that scale the window (such as during startup).