Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/renderer/searchbox_extension.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/renderer/searchbox_extension.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "chrome/common/render_messages_params.h"
+#include "chrome/renderer/render_view_wrapper.h"
 #include "chrome/renderer/searchbox.h"
-#include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebFrame;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 using WebKit::WebView;
 
@@ skipping 100 matching lines @@
 class SearchBoxExtensionWrapper : public v8::Extension {
  public:
   SearchBoxExtensionWrapper();
 
   // Allows v8's javascript code to call the native functions defined
   // in this class for window.chrome.
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
       v8::Handle<v8::String> name);
 
   // Helper function to find the RenderView. May return NULL.
-  static RenderView* GetRenderView();
+  static RenderViewWrapper* GetRenderViewWrapper();
 
   // Gets the value of the user's search query.
   static v8::Handle<v8::Value> GetValue(const v8::Arguments& args);
 
   // Gets whether the |value| should be considered final -- as opposed to a
   // partial match. This may be set if the user clicks a suggestion, presses
   // forward delete, or in other cases where Chrome overrides.
   static v8::Handle<v8::Value> GetVerbatim(const v8::Arguments& args);
 
   // Gets the start of the selection in the search box.
@@ skipping 44 matching lines @@
     return v8::FunctionTemplate::New(GetWidth);
   } else if (name->Equals(v8::String::New("GetHeight"))) {
     return v8::FunctionTemplate::New(GetHeight);
   } else if (name->Equals(v8::String::New("SetSuggestions"))) {
     return v8::FunctionTemplate::New(SetSuggestions);
   }
   return v8::Handle<v8::FunctionTemplate>();
 }
 
 // static
-RenderView* SearchBoxExtensionWrapper::GetRenderView() {
+RenderViewWrapper* SearchBoxExtensionWrapper::GetRenderViewWrapper() {
   WebFrame* webframe = WebFrame::frameForEnteredContext();
   DCHECK(webframe) << "There should be an active frame since we just got "
       "a native function called.";
   if (!webframe) return NULL;
 
   WebView* webview = webframe->view();
   if (!webview) return NULL;  // can happen during closing
 
-  return RenderView::FromWebView(webview);
+  return RenderViewWrapper::FromWebView(webview);
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetValue(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
   return v8::String::New(
       reinterpret_cast<const uint16_t*>(
-          render_view->searchbox()->value().c_str()),
-      render_view->searchbox()->value().length());
+          render_view_wrapper->searchbox()->value().c_str()),
+      render_view_wrapper->searchbox()->value().length());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetVerbatim(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Boolean::New(render_view->searchbox()->verbatim());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Boolean::New(render_view_wrapper->searchbox()->verbatim());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetSelectionStart(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->selection_start());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->selection_start());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetSelectionEnd(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->selection_end());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->selection_end());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetX(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().x());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().x());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetY(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().y());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().y());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetWidth(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().width());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().width());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetHeight(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().height());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().height());
 }
 
 // Accepts a single argument in form:
 // {
 //   suggestions: [
 //     {
 //       value: "..."
 //     }
 //   ]
 // }
@@ skipping 47 matching lines @@
           suggestion_json->Get(v8::String::New("complete_behavior"));
       if (complete_value->IsString()) {
         if (complete_value->Equals(v8::String::New("never")))
           behavior = INSTANT_COMPLETE_NEVER;
         else if (complete_value->Equals(v8::String::New("delayed")))
           behavior = INSTANT_COMPLETE_DELAYED;
       }
     }
   }
 
-  if (RenderView* render_view = GetRenderView())
-    render_view->searchbox()->SetSuggestions(suggestions, behavior);
+  if (RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper())
+    render_view_wrapper->searchbox()->SetSuggestions(suggestions, behavior);
   return v8::Undefined();
 }
 
 // static
 bool Dispatch(WebFrame* frame, const std::string& event_name) {
   DCHECK(frame) << "Dispatch requires frame";
   if (!frame) return false;
 
   v8::HandleScope handle_scope;
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
@@ skipping 70 matching lines @@
 
   return supports_searchbox_api || supports_deprecated_api;
 }
 
 // static
 v8::Extension* SearchBoxExtension::Get() {
   return new SearchBoxExtensionWrapper();
 }
 
 }  // namespace extensions_v8