Implement sidebar support for extension action popups

extensions/browser/extension_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/extension_host.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 49 matching lines @@
       browser_context_(site_instance->GetBrowserContext()),
       render_view_host_(nullptr),
       has_loaded_once_(false),
       document_element_available_(false),
       initial_url_(url),
       extension_function_dispatcher_(browser_context_, this),
       extension_host_type_(host_type) {
   // 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);
 
   render_view_host_ = host_contents_->GetRenderViewHost();
 
   // Listen for when an extension is unloaded from the same profile, as it may
   // be the same extension that this points to.
   ExtensionRegistry::Get(browser_context_)->AddObserver(this);
 
@@ skipping 132 matching lines @@
   return host_contents()->GetURL();
 }
 
 void ExtensionHost::LoadInitialURL() {
   load_start_.reset(new base::ElapsedTimer());
   host_contents_->GetController().LoadURL(
       initial_url_, content::Referrer(), ui::PAGE_TRANSITION_LINK,
       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;
 }
 
 void ExtensionHost::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   // The extension object will be deleted after this notification has been sent.
@@ skipping 235 matching lines @@
     }
   } else if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP) {
     UMA_HISTOGRAM_MEDIUM_TIMES("Extensions.PopupLoadTime2",
                                load_start_->Elapsed());
     UMA_HISTOGRAM_MEDIUM_TIMES("Extensions.PopupCreateTime",
                                create_start_.Elapsed());
   }
 }
 
 }  // namespace extensions