summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/external_host_bindings.h4
-rw-r--r--chrome/renderer/render_view.cc18
-rw-r--r--chrome/renderer/render_view.h6
-rw-r--r--chrome/renderer/web_ui_bindings.cc (renamed from chrome/renderer/dom_ui_bindings.cc)10
-rw-r--r--chrome/renderer/web_ui_bindings.h (renamed from chrome/renderer/dom_ui_bindings.h)18
5 files changed, 28 insertions, 28 deletions
diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h
index 12bc001..13b354a 100644
--- a/chrome/renderer/external_host_bindings.h
+++ b/chrome/renderer/external_host_bindings.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
@@ -6,7 +6,7 @@
#define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_
#pragma once
-#include "chrome/renderer/dom_ui_bindings.h"
+#include "chrome/renderer/web_ui_bindings.h"
#include "ipc/ipc_message.h"
// ExternalHostBindings is the class backing the "externalHost" object
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 67b33c5..4de9a22 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -56,7 +56,6 @@
#include "chrome/renderer/device_orientation_dispatcher.h"
#include "chrome/renderer/devtools_agent.h"
#include "chrome/renderer/devtools_client.h"
-#include "chrome/renderer/dom_ui_bindings.h"
#include "chrome/renderer/extension_groups.h"
#include "chrome/renderer/extensions/bindings_utils.h"
#include "chrome/renderer/extensions/event_bindings.h"
@@ -92,6 +91,7 @@
#include "chrome/renderer/user_script_idle_scheduler.h"
#include "chrome/renderer/user_script_slave.h"
#include "chrome/renderer/visitedlink_slave.h"
+#include "chrome/renderer/web_ui_bindings.h"
#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
#include "chrome/renderer/webplugin_delegate_pepper.h"
#include "chrome/renderer/webplugin_delegate_proxy.h"
@@ -3449,9 +3449,9 @@ void RenderView::didClearWindowObject(WebFrame* frame) {
(frame_url.SchemeIs(chrome::kChromeUIScheme) ||
frame_url.SchemeIs(chrome::kGearsScheme) ||
frame_url.SchemeIs(chrome::kDataScheme))) {
- GetDOMUIBindings()->set_message_sender(this);
- GetDOMUIBindings()->set_routing_id(routing_id_);
- GetDOMUIBindings()->BindToJavascript(frame, "chrome");
+ GetWebUIBindings()->set_message_sender(this);
+ GetWebUIBindings()->set_routing_id(routing_id_);
+ GetWebUIBindings()->BindToJavascript(frame, "chrome");
}
if (BindingsPolicy::is_external_host_enabled(enabled_bindings_)) {
GetExternalHostBindings()->set_message_sender(this);
@@ -4166,11 +4166,11 @@ GURL RenderView::GetAlternateErrorPageURL(const GURL& failed_url,
return url;
}
-DOMUIBindings* RenderView::GetDOMUIBindings() {
- if (!dom_ui_bindings_.get()) {
- dom_ui_bindings_.reset(new DOMUIBindings());
+WebUIBindings* RenderView::GetWebUIBindings() {
+ if (!web_ui_bindings_.get()) {
+ web_ui_bindings_.reset(new WebUIBindings());
}
- return dom_ui_bindings_.get();
+ return web_ui_bindings_.get();
}
ExternalHostBindings* RenderView::GetExternalHostBindings() {
@@ -4614,7 +4614,7 @@ void RenderView::OnAllowBindings(int enabled_bindings_flags) {
void RenderView::OnSetDOMUIProperty(const std::string& name,
const std::string& value) {
DCHECK(BindingsPolicy::is_dom_ui_enabled(enabled_bindings_));
- GetDOMUIBindings()->SetProperty(name, value);
+ GetWebUIBindings()->SetProperty(name, value);
}
void RenderView::OnReservePageIDRange(int size_of_range) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 6cf1727..2540ba0 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -61,7 +61,7 @@ class DeviceOrientationDispatcher;
class DevToolsAgent;
class DevToolsClient;
class DomAutomationController;
-class DOMUIBindings;
+class WebUIBindings;
class ExternalHostBindings;
class FilePath;
class GeolocationDispatcher;
@@ -1057,7 +1057,7 @@ class RenderView : public RenderWidget,
// Locates a sub frame with given xpath
WebKit::WebFrame* GetChildFrame(const std::wstring& frame_xpath) const;
- DOMUIBindings* GetDOMUIBindings();
+ WebUIBindings* GetWebUIBindings();
ExternalHostBindings* GetExternalHostBindings();
@@ -1445,7 +1445,7 @@ class RenderView : public RenderWidget,
// Allows Web UI pages (new tab page, etc.) to talk to the browser. The JS
// object is only exposed when Web UI bindings are enabled.
- scoped_ptr<DOMUIBindings> dom_ui_bindings_;
+ scoped_ptr<WebUIBindings> web_ui_bindings_;
// External host exposed through automation controller.
scoped_ptr<ExternalHostBindings> external_host_bindings_;
diff --git a/chrome/renderer/dom_ui_bindings.cc b/chrome/renderer/web_ui_bindings.cc
index a938f03..69a2d98 100644
--- a/chrome/renderer/dom_ui_bindings.cc
+++ b/chrome/renderer/web_ui_bindings.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/renderer/dom_ui_bindings.h"
+#include "chrome/renderer/web_ui_bindings.h"
#include "base/json/json_writer.h"
#include "base/scoped_ptr.h"
@@ -52,13 +52,13 @@ DOMBoundBrowserObject::~DOMBoundBrowserObject() {
STLDeleteContainerPointers(properties_.begin(), properties_.end());
}
-DOMUIBindings::DOMUIBindings() {
- BindMethod("send", &DOMUIBindings::send);
+WebUIBindings::WebUIBindings() {
+ BindMethod("send", &WebUIBindings::send);
}
-DOMUIBindings::~DOMUIBindings() {}
+WebUIBindings::~WebUIBindings() {}
-void DOMUIBindings::send(const CppArgumentList& args, CppVariant* result) {
+void WebUIBindings::send(const CppArgumentList& args, CppVariant* result) {
// We expect at least a string message identifier, and optionally take
// an object parameter. If we get anything else we bail.
if (args.size() < 1 || args.size() > 2)
diff --git a/chrome/renderer/dom_ui_bindings.h b/chrome/renderer/web_ui_bindings.h
index f2fdb71..8f5841c 100644
--- a/chrome/renderer/dom_ui_bindings.h
+++ b/chrome/renderer/web_ui_bindings.h
@@ -1,9 +1,9 @@
-// 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.
-#ifndef CHROME_RENDERER_DOM_UI_BINDINGS_H_
-#define CHROME_RENDERER_DOM_UI_BINDINGS_H_
+#ifndef CHROME_RENDERER_WEB_UI_BINDINGS_H_
+#define CHROME_RENDERER_WEB_UI_BINDINGS_H_
#pragma once
#include "ipc/ipc_message.h"
@@ -47,22 +47,22 @@ class DOMBoundBrowserObject : public CppBoundClass {
DISALLOW_COPY_AND_ASSIGN(DOMBoundBrowserObject);
};
-// DOMUIBindings is the class backing the "chrome" object accessible
+// WebUIBindings is the class backing the "chrome" object accessible
// from Javascript from privileged pages.
//
// We expose one function, for sending a message to the browser:
// send(String name, Object argument);
// It's plumbed through to the OnDOMUIMessage callback on RenderViewHost
// delegate.
-class DOMUIBindings : public DOMBoundBrowserObject {
+class WebUIBindings : public DOMBoundBrowserObject {
public:
- DOMUIBindings();
- virtual ~DOMUIBindings();
+ WebUIBindings();
+ virtual ~WebUIBindings();
// The send() function provided to Javascript.
void send(const CppArgumentList& args, CppVariant* result);
private:
- DISALLOW_COPY_AND_ASSIGN(DOMUIBindings);
+ DISALLOW_COPY_AND_ASSIGN(WebUIBindings);
};
-#endif // CHROME_RENDERER_DOM_UI_BINDINGS_H_
+#endif // CHROME_RENDERER_WEB_UI_BINDINGS_H_
generated by cgit v1.1 at 2025-02-14 05:49:26 +0000