chrome/browser/ui/startup/session_crashed_prompt.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/startup/session_crashed_prompt.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/startup/obsolete_os_prompt_mac.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/session_crashed_prompt.cc

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

--- chrome/browser/ui/startup/session_crashed_prompt.cc (revision 145001)

+++ chrome/browser/ui/startup/session_crashed_prompt.cc (working copy)

@@ -11,6 +11,7 @@

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

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

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

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

#include "chrome/common/url_constants.h"

#include "content/public/browser/web_contents.h"

#include "grit/chromium_strings.h"

@@ -72,7 +73,7 @@

Browser* browser =

browser::FindBrowserWithWebContents(owner()->web_contents());

if (browser->tab_count() == 1 &&

- browser->GetWebContentsAt(0)->GetURL() ==

+ chrome::GetWebContentsAt(browser, 0)->GetURL() ==

GURL(chrome::kChromeUINewTabURL)) {

// There is only one tab and its the new tab page, make session restore

// clobber it.

@@ -96,7 +97,7 @@

// In ChromeBot tests, there might be a race. This line appears to get

// called during shutdown and |tab| can be NULL.

- TabContents* tab = browser->GetActiveTabContents();

+ TabContents* tab = chrome::GetActiveTabContents(browser);

if (!tab)

return;