Make WebContentsObserver::web_contents() public

chrome/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 "chrome/browser/guest_view/extension_options/extension_options_guest.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/guest_view/extension_options/extension_options_constants.h"
@@ skipping 89 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();
-  guest_web_contents()->GetController().LoadURL(options_page_,
-                                                content::Referrer(),
-                                                content::PAGE_TRANSITION_LINK,
-                                                std::string());
+  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));
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
-      guest_web_contents());
+      web_contents());
 }
 
 void ExtensionOptionsGuest::DidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEventToEmbedder(new extensions::GuestViewBase::Event(
       extensions::api::extension_options_internal::OnLoad::kEventName,
       args.Pass()));
 }
 
 const char* ExtensionOptionsGuest::GetAPINamespace() const {
@@ skipping 14 matching lines @@
   args->SetInteger(extensionoptions::kOldHeight, old_size.height());
   DispatchEventToEmbedder(new extensions::GuestViewBase::Event(
       extension_options_internal::OnSizeChanged::kEventName, args.Pass()));
 }
 
 bool ExtensionOptionsGuest::IsAutoSizeSupported() const {
   return true;
 }
 
 content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const {
-  return guest_web_contents();
+  return web_contents();
 }
 
 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) {
   ContextMenuDelegate* menu_delegate =
-      ContextMenuDelegate::FromWebContents(guest_web_contents());
+      ContextMenuDelegate::FromWebContents(web_contents());
   DCHECK(menu_delegate);
 
   scoped_ptr<RenderViewContextMenu> menu =
-      menu_delegate->BuildMenu(guest_web_contents(), params);
+      menu_delegate->BuildMenu(web_contents(), params);
   menu_delegate->ShowMenu(menu.Pass());
   return true;
 }
 
 bool ExtensionOptionsGuest::ShouldCreateWebContents(
     content::WebContents* web_contents,
     int route_id,
     WindowContainerType window_container_type,
     const base::string16& frame_name,
     const GURL& target_url,
@@ skipping 22 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(ExtensionOptionsGuest, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ExtensionOptionsGuest::OnRequest(
     const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_->Dispatch(
-      params, guest_web_contents()->GetRenderViewHost());
+      params, web_contents()->GetRenderViewHost());
 }
 
 void ExtensionOptionsGuest::SetUpAutoSize() {
   // Read the autosize parameters passed in from the embedder.
   bool auto_size_enabled = false;
   attach_params()->GetBoolean(extensionoptions::kAttributeAutoSize,
                               &auto_size_enabled);
 
   int max_height = 0;
   int max_width = 0;
   attach_params()->GetInteger(extensionoptions::kAttributeMaxHeight,
                               &max_height);
   attach_params()->GetInteger(extensionoptions::kAttributeMaxWidth, &max_width);
 
   int min_height = 0;
   int min_width = 0;
   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));
 }