Refactor ExtensionOptionsGuestDelegate to have an ExtensionOptionsGuest

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 11 matching lines @@
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ipc/ipc_message_macros.h"
 
 using content::WebContents;
 using namespace extensions::core_api;
 
+namespace extensions {
+
 // 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()) {
+              ->CreateExtensionOptionsGuestDelegate(this)) {
 }
 
 ExtensionOptionsGuest::~ExtensionOptionsGuest() {
 }
 
 // static
 extensions::GuestViewBase* ExtensionOptionsGuest::Create(
     content::BrowserContext* browser_context,
     int guest_instance_id) {
   if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {
@@ skipping 56 matching lines @@
   web_contents()->GetController().LoadURL(options_page_,
                                           content::Referrer(),
                                           content::PAGE_TRANSITION_LINK,
                                           std::string());
 }
 
 void ExtensionOptionsGuest::DidInitialize() {
   extension_function_dispatcher_.reset(
       new extensions::ExtensionFunctionDispatcher(browser_context(), this));
   if (extension_options_guest_delegate_) {
-    extension_options_guest_delegate_->CreateChromeExtensionWebContentsObserver(
-        web_contents());
+    extension_options_guest_delegate_
+        ->CreateChromeExtensionWebContentsObserver();

[Fady Samuel, 2014/09/11 18:53:36]

I would just call it DidInitialize, otherwise you're exposing chrome module
details to extensions.

   }
 }
 
 void ExtensionOptionsGuest::DidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEventToEmbedder(new extensions::GuestViewBase::Event(
       extension_options_internal::OnLoad::kEventName, args.Pass()));
 }
 
 const char* ExtensionOptionsGuest::GetAPINamespace() const {
@@ skipping 29 matching lines @@
     const content::OpenURLParams& params) {
   if (!extension_options_guest_delegate_)
     return NULL;
 
   // Don't allow external URLs with the CURRENT_TAB disposition be opened in
   // this guest view, change the disposition to NEW_FOREGROUND_TAB.
   if ((!params.url.SchemeIs(extensions::kExtensionScheme) ||
        params.url.host() != options_page_.host()) &&
       params.disposition == CURRENT_TAB) {
     return extension_options_guest_delegate_->OpenURLInNewTab(
-        embedder_web_contents(),
         content::OpenURLParams(params.url,
                                params.referrer,
                                params.frame_tree_node_id,
                                NEW_FOREGROUND_TAB,
                                params.transition,
                                params.is_renderer_initiated));
   }
-  return extension_options_guest_delegate_->OpenURLInNewTab(
-      embedder_web_contents(), params);
+  return extension_options_guest_delegate_->OpenURLInNewTab(params);
 }
 
 void ExtensionOptionsGuest::CloseContents(content::WebContents* source) {
   DispatchEventToEmbedder(new extensions::GuestViewBase::Event(
       extension_options_internal::OnClose::kEventName,
       make_scoped_ptr(new base::DictionaryValue())));
 }
 
 bool ExtensionOptionsGuest::HandleContextMenu(
     const content::ContextMenuParams& params) {
   if (!extension_options_guest_delegate_)
     return false;
 
-  return extension_options_guest_delegate_->HandleContextMenu(web_contents(),
-                                                              params);
+  return extension_options_guest_delegate_->HandleContextMenu(params);
 }
 
 bool ExtensionOptionsGuest::ShouldCreateWebContents(
     content::WebContents* web_contents,
     int route_id,
     WindowContainerType window_container_type,
     const base::string16& frame_name,
     const GURL& target_url,
     const std::string& partition_id,
     content::SessionStorageNamespace* session_storage_namespace) {
   // This method handles opening links from within the guest. Since this guest
   // view is used for displaying embedded extension options, we want any
   // external links to be opened in a new tab, not in a new guest view.
   // Therefore we just open the URL in a new tab, and since we aren't handling
   // the new web contents, we return false.
   // TODO(ericzeng): Open the tab in the background if the click was a
   //   ctrl-click or middle mouse button click
   if (extension_options_guest_delegate_) {
     extension_options_guest_delegate_->OpenURLInNewTab(
-        embedder_web_contents(),
         content::OpenURLParams(target_url,
                                content::Referrer(),
                                NEW_FOREGROUND_TAB,
                                content::PAGE_TRANSITION_LINK,
                                false));
   }
   return false;
 }
 
 bool ExtensionOptionsGuest::OnMessageReceived(const IPC::Message& message) {
@@ skipping 28 matching lines @@
   attach_params()->GetInteger(extensionoptions::kAttributeMinHeight,
                               &min_height);
   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