diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
| commit | 52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch) | |
| tree | f39b0d32959778625fdeb00f178061a6411213c3 /chrome/browser/ui/views/toolbar_view.cc | |
| parent | 78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff) | |
| download | chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2 | |
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10702029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/toolbar_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/toolbar_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 5da5f22..305aa00 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -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 @@ void ToolbarView::OnMenuButtonClicked(views::View* source, // ToolbarView, LocationBarView::Delegate implementation: TabContents* ToolbarView::GetTabContents() const { - return browser_->GetActiveTabContents(); + return chrome::GetActiveTabContents(browser_); } InstantController* ToolbarView::GetInstant() { @@ -929,7 +930,7 @@ void ToolbarView::UpdateAppMenuState() { 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). |