Index: chrome/renderer/searchbox_extension.cc |
=================================================================== |
--- chrome/renderer/searchbox_extension.cc (revision 80513) |
+++ chrome/renderer/searchbox_extension.cc (working copy) |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -216,8 +216,8 @@ |
if (!render_view) return v8::Undefined(); |
return v8::String::New( |
reinterpret_cast<const uint16_t*>( |
- render_view->searchbox()->value().c_str()), |
- render_view->searchbox()->value().length()); |
+ SearchBox::Get(render_view)->value().c_str()), |
+ SearchBox::Get(render_view)->value().length()); |
} |
// static |
@@ -225,7 +225,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Boolean::New(render_view->searchbox()->verbatim()); |
+ return v8::Boolean::New(SearchBox::Get(render_view)->verbatim()); |
} |
// static |
@@ -233,7 +233,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->selection_start()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->selection_start()); |
} |
// static |
@@ -241,7 +241,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->selection_end()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->selection_end()); |
} |
// static |
@@ -249,7 +249,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->rect().x()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->rect().x()); |
} |
// static |
@@ -257,7 +257,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->rect().y()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->rect().y()); |
} |
// static |
@@ -265,7 +265,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->rect().width()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->rect().width()); |
} |
// static |
@@ -273,7 +273,7 @@ |
const v8::Arguments& args) { |
RenderView* render_view = GetRenderView(); |
if (!render_view) return v8::Undefined(); |
- return v8::Int32::New(render_view->searchbox()->rect().height()); |
+ return v8::Int32::New(SearchBox::Get(render_view)->rect().height()); |
} |
// Accepts a single argument in form: |
@@ -342,7 +342,7 @@ |
} |
if (RenderView* render_view = GetRenderView()) |
- render_view->searchbox()->SetSuggestions(suggestions, behavior); |
+ SearchBox::Get(render_view)->SetSuggestions(suggestions, behavior); |
return v8::Undefined(); |
} |