chrome/browser/ui/views/sad_tab_view.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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/sad_tab_view.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc

index cbf5dccb6afdf60d4b7c9ebe358b194dcf0a5564..046a794a08af28a481aaa8e1ae62fbf07eda2ed9 100644

--- a/chrome/browser/ui/views/sad_tab_view.cc

+++ b/chrome/browser/ui/views/sad_tab_view.cc

@@ -76,7 +76,7 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) {

false /* is renderer initiated */));

} else if (source == feedback_link_) {

browser::ShowHtmlBugReportView(

- Browser::GetBrowserForController(&tab_contents_->GetController(), NULL),

+ Browser::GetBrowserForController(&tab_contents_->controller(), NULL),

l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE),

userfeedback::ChromeOsData_ChromeOsCategory_CRASH);

}

@@ -86,7 +86,7 @@ void SadTabView::ButtonPressed(views::Button* source,

const views::Event& event) {

DCHECK(tab_contents_);

DCHECK(source == reload_button_);

- tab_contents_->GetController().Reload(true);

+ tab_contents_->controller().Reload(true);

}

void SadTabView::Layout() {