chrome/browser/extensions/extension_host.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/extensions/extension_host.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/extensions/extension_crash_recovery_browsertest.cc ('k') | chrome/browser/extensions/extension_message_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_host.cc

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc

index 5cccfde06432d6555e570537446d15ae719ae8af..f76807508234957db385d368ed52e47e23755e5b 100644

--- a/chrome/browser/extensions/extension_host.cc

+++ b/chrome/browser/extensions/extension_host.cc

@@ -133,7 +133,7 @@ ExtensionHost::ExtensionHost(const Extension* extension,

profile_, site_instance, MSG_ROUTING_NONE, NULL, NULL));

TabContentsObserver::Observe(host_contents_.get());

host_contents_->SetDelegate(this);

- host_contents_->SetViewType(host_type);

+ host_contents_->set_view_type(host_type);

// TODO(mpcomplete): This was lifted from PrefsTabHelper, but it might be

// better to reuse all of PrefsTabHelper. We'd first have to make it not

@@ -251,7 +251,7 @@ void ExtensionHost::LoadInitialURL() {

return;

}

- host_contents_->GetController().LoadURL(

+ host_contents_->controller().LoadURL(

initial_url_, content::Referrer(), content::PAGE_TRANSITION_LINK,

std::string());

}