GuestView: Move lifetime management out of content

extensions/browser/guest_view/extension_options/extension_options_guest.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/guest_view/extension_options/extension_options_guest.h"
 
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
@@ skipping 22 matching lines @@
 
 // static
 const char ExtensionOptionsGuest::Type[] = "extensionoptions";
 
 ExtensionOptionsGuest::ExtensionOptionsGuest(
     content::BrowserContext* browser_context,
     int guest_instance_id)
     : GuestView<ExtensionOptionsGuest>(browser_context, guest_instance_id),
       extension_options_guest_delegate_(
           extensions::ExtensionsAPIClient::Get()
-              ->CreateExtensionOptionsGuestDelegate(this)) {
+              ->CreateExtensionOptionsGuestDelegate(this)),
+      has_navigated_(false) {
 }
 
 ExtensionOptionsGuest::~ExtensionOptionsGuest() {
 }
 
 // static
 extensions::GuestViewBase* ExtensionOptionsGuest::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id) {
   if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {
@@ skipping 47 matching lines @@
   // WebContents, so we can use |extension_url| for creating the SiteInstance.
   content::SiteInstance* options_site_instance =
       content::SiteInstance::CreateForURL(browser_context(), extension_url);
   WebContents::CreateParams params(browser_context(), options_site_instance);
   params.guest_delegate = this;
   callback.Run(WebContents::Create(params));
 }
 
 void ExtensionOptionsGuest::DidAttachToEmbedder() {
   SetUpAutoSize();
+
+  // We should not re-navigate on reattachment.
+  if (has_navigated_)
+    return;
+
   web_contents()->GetController().LoadURL(options_page_,
                                           content::Referrer(),
                                           ui::PAGE_TRANSITION_LINK,
                                           std::string());
+  has_navigated_ = true;
 }
 
 void ExtensionOptionsGuest::DidInitialize() {
   extension_function_dispatcher_.reset(
       new extensions::ExtensionFunctionDispatcher(browser_context(), this));
   if (extension_options_guest_delegate_) {
     extension_options_guest_delegate_->DidInitialize();
   }
 }
 
@@ skipping 127 matching lines @@
   attach_params()->GetInteger(extensionoptions::kAttributeMinWidth, &min_width);
 
   // Call SetAutoSize to apply all the appropriate validation and clipping of
   // values.
   SetAutoSize(auto_size_enabled,
               gfx::Size(min_width, min_height),
               gfx::Size(max_width, max_height));
 }
 
 }  // namespace extensions