| Index: extensions/browser/extension_host.cc
|
| diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
|
| index 0b501a6ceef75b17d6f3642b0006dc5499c88288..d7e2afd466786a559a31e89322548aed8ef24948 100644
|
| --- a/extensions/browser/extension_host.cc
|
| +++ b/extensions/browser/extension_host.cc
|
| @@ -67,9 +67,10 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
| // Not used for panels, see PanelHost.
|
| DCHECK(host_type == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE ||
|
| host_type == VIEW_TYPE_EXTENSION_DIALOG ||
|
| - host_type == VIEW_TYPE_EXTENSION_POPUP);
|
| + host_type == VIEW_TYPE_EXTENSION_POPUP ||
|
| + host_type == VIEW_TYPE_EXTENSION_SIDEBAR);
|
| host_contents_.reset(WebContents::Create(
|
| - WebContents::CreateParams(browser_context_, site_instance))),
|
| + WebContents::CreateParams(browser_context_, site_instance)));
|
| content::WebContentsObserver::Observe(host_contents_.get());
|
| host_contents_->SetDelegate(this);
|
| SetViewType(host_contents_.get(), host_type);
|
| @@ -225,6 +226,11 @@ void ExtensionHost::LoadInitialURL() {
|
| std::string());
|
| }
|
|
|
| +void ExtensionHost::LoadURL(const GURL& url) {
|
| + initial_url_ = url;
|
| + LoadInitialURL();
|
| +}
|
| +
|
| bool ExtensionHost::IsBackgroundPage() const {
|
| DCHECK_EQ(extension_host_type_, VIEW_TYPE_EXTENSION_BACKGROUND_PAGE);
|
| return true;
|
|
|