Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

content/browser/webui/web_ui.cc

 // Copyright (c) 2011 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 "content/browser/webui/web_ui.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/generic_handler.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
+using content::WebContents;
+
 // static
 string16 WebUI::GetJavascriptCall(
     const std::string& function_name,
     const std::vector<const Value*>& arg_list) {
   string16 parameters;
   std::string json;
   for (size_t i = 0; i < arg_list.size(); ++i) {
     if (i > 0)
       parameters += char16(',');
 
     base::JSONWriter::Write(arg_list[i], false, &json);
     parameters += UTF8ToUTF16(json);
   }
   return ASCIIToUTF16(function_name) +
       char16('(') + parameters + char16(')') + char16(';');
 }
 
-WebUI::WebUI(TabContents* contents)
+WebUI::WebUI(WebContents* contents)
     : hide_favicon_(false),
       focus_location_bar_by_default_(false),
       should_hide_url_(false),
       link_transition_type_(content::PAGE_TRANSITION_LINK),
       bindings_(content::BINDINGS_POLICY_WEB_UI),
       register_callback_overwrites_(false),
-      tab_contents_(contents) {
+      web_contents_(contents) {
   DCHECK(contents);
   AddMessageHandler(new GenericHandler());
 }
 
 WebUI::~WebUI() {
   STLDeleteContainerPointers(handlers_.begin(), handlers_.end());
 }
 
 // WebUI, public: -------------------------------------------------------------
 
 const WebUI::TypeID WebUI::kNoWebUI = NULL;
 
 bool WebUI::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebUI, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_WebUISend, OnWebUISend)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WebUI::OnWebUISend(const GURL& source_url,
                         const std::string& message,
                         const ListValue& args) {
   if (!ChildProcessSecurityPolicy::GetInstance()->
-          HasWebUIBindings(tab_contents_->GetRenderProcessHost()->GetID())) {
+          HasWebUIBindings(web_contents_->GetRenderProcessHost()->GetID())) {
     NOTREACHED() << "Blocked unauthorized use of WebUIBindings.";
     return;
   }
 
   // Look up the callback for this message.
   MessageCallbackMap::const_iterator callback =
       message_callbacks_.find(message);
   if (callback != message_callbacks_.end()) {
     // Forward this message and content on.
     callback->second.Run(&args);
@@ skipping 82 matching lines @@
 
 // WebUI, protected: ----------------------------------------------------------
 
 void WebUI::AddMessageHandler(WebUIMessageHandler* handler) {
   handler->set_web_ui(this);
   handler->RegisterMessages();
   handlers_.push_back(handler);
 }
 
 void WebUI::ExecuteJavascript(const string16& javascript) {
-  tab_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
+  web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
       ASCIIToUTF16(frame_xpath_), javascript);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WebUIMessageHandler
 WebUIMessageHandler::WebUIMessageHandler() : web_ui_(NULL) {
 }
 
 WebUIMessageHandler::~WebUIMessageHandler() {
 }
@@ skipping 49 matching lines @@
   return false;
 }
 
 string16 WebUIMessageHandler::ExtractStringValue(const ListValue* value) {
   string16 string16_value;
   if (value->GetString(0, &string16_value))
     return string16_value;
   NOTREACHED();
   return string16();
 }