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

Unified Diff: chrome/browser/ui/browser_navigator.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
Index: chrome/browser/ui/browser_navigator.cc
===================================================================
--- chrome/browser/ui/browser_navigator.cc (revision 145001)
+++ chrome/browser/ui/browser_navigator.cc (working copy)
@@ -23,6 +23,7 @@
#include "chrome/browser/tab_contents/tab_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/singleton_tabs.h"
@@ -104,8 +105,7 @@
// GetBrowserForDisposition() has a chance to replace |params->browser| with
// another one.
if (!params->source_contents && params->browser)
- params->source_contents =
- params->browser->GetActiveTabContents();
+ params->source_contents = chrome::GetActiveTabContents(params->browser);
Profile* profile =
params->browser ? params->browser->profile() : params->profile;
@@ -502,7 +502,7 @@
WebContents* source_contents = params->source_contents ?
params->source_contents->web_contents() : NULL;
params->target_contents =
- Browser::TabContentsFactory(
+ chrome::TabContentsFactory(
params->browser->profile(),
tab_util::GetSiteInstanceForNewTab(
params->browser->profile(), url),
@@ -586,7 +586,8 @@
}
if (singleton_index >= 0) {
- WebContents* target = params->browser->GetWebContentsAt(singleton_index);
+ WebContents* target =
+ chrome::GetWebContentsAt(params->browser, singleton_index);
if (target->IsCrashed()) {
target->GetController().Reload(true);
@@ -598,7 +599,7 @@
// If the singleton tab isn't already selected, select it.
if (params->source_contents != params->target_contents)
- params->browser->ActivateTabAt(singleton_index, user_initiated);
+ chrome::ActivateTabAt(params->browser, singleton_index, user_initiated);
}
if (params->disposition != CURRENT_TAB) {
« no previous file with comments | « chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc ('k') | chrome/browser/ui/browser_navigator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698