chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.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/autofill/autofill_feedback_infobar_delegate.cc ('k') | chrome/browser/automation/automation_provider_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/automation_provider_observers.cc

diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc

index ad48c70ea5292597c95b3f456f92245daa1e91e0..d0f2ba684a27486b13f3a4ab48370f7e64852ac0 100644

--- a/chrome/browser/automation/automation_provider_observers.cc

+++ b/chrome/browser/automation/automation_provider_observers.cc

@@ -392,7 +392,7 @@ void TabStripNotificationObserver::Observe(

if (type == notification_) {

if (type == content::NOTIFICATION_TAB_PARENTED) {

ObserveTab(&(content::Source<TabContentsWrapper>(source).ptr()->

- tab_contents()->GetController()));

+ tab_contents()->controller()));

} else {

ObserveTab(content::Source<NavigationController>(source).ptr());

}

@@ -1079,7 +1079,7 @@ bool ExecuteBrowserCommandObserver::CreateAndRegisterObserver(

case IDC_FORWARD:

case IDC_RELOAD: {

new NavigationNotificationObserver(

- &browser->GetSelectedTabContents()->GetController(),

+ &browser->GetSelectedTabContents()->controller(),

automation, reply_message, 1, false, false);

break;

}

@@ -2751,7 +2751,7 @@ void NewTabObserver::Observe(int type,

DCHECK_EQ(content::NOTIFICATION_TAB_PARENTED, type);

NavigationController* controller =

&(content::Source<TabContentsWrapper>(source).ptr()->

- tab_contents()->GetController());

+ tab_contents()->controller());

if (automation_) {

// TODO(phajdan.jr): Clean up this hack. We write the correct return type

// here, but don't send the message. NavigationNotificationObserver