chrome/browser/ui/cocoa/html_dialog_window_controller.mm - 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/cocoa/html_dialog_window_controller.mm

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/cocoa/constrained_html_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/html_dialog_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm

index f1daf98fa16778220c9f469e1f868823ae1e2ed8..694afe5fb0b94cfc51920aaa0322c5417a8da635 100644

--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm

+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm

@@ -298,11 +298,11 @@ void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent(

HtmlDialogUI::GetPropertyAccessor().SetProperty(

contentsWrapper_->tab_contents()->GetPropertyBag(), delegate_.get());

- contentsWrapper_->tab_contents()->GetController().LoadURL(

- delegate_->GetDialogContentURL(),

- content::Referrer(),

- content::PAGE_TRANSITION_START_PAGE,

- std::string());

+ contentsWrapper_->tab_contents()->controller().LoadURL(

+ delegate_->GetDialogContentURL(),

+ content::Referrer(),

+ content::PAGE_TRANSITION_START_PAGE,

+ std::string());

// TODO(akalin): add accelerator for ESC to close the dialog box.