summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 10:25:57 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 10:25:57 +0000
commit0a0a2ea9998d4504cffccdffcfbd2a7e698b7339 (patch)
treece79381a209f40f1c671864ae526578eb7e1a1c7 /webkit
parentd992e7610c3f05f0042250b1180165075ebf2f44 (diff)
downloadchromium_src-0a0a2ea9998d4504cffccdffcfbd2a7e698b7339.zip
chromium_src-0a0a2ea9998d4504cffccdffcfbd2a7e698b7339.tar.gz
chromium_src-0a0a2ea9998d4504cffccdffcfbd2a7e698b7339.tar.bz2
DevTools: pass proper platform names on non-windows.
Review URL: http://codereview.chromium.org/122031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/inspector_controller_impl.js8
-rw-r--r--webkit/glue/webdevtoolsclient_impl.cc15
-rw-r--r--webkit/glue/webdevtoolsclient_impl.h1
3 files changed, 24 insertions, 0 deletions
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 748961c..d04b16a 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -20,6 +20,14 @@ goog.inherits(devtools.InspectorControllerImpl,
/**
* {@inheritDoc}.
*/
+devtools.InspectorController.prototype.platform = function() {
+ return DevToolsHost.getPlatform();
+};
+
+
+/**
+ * {@inheritDoc}.
+ */
devtools.InspectorController.prototype.clearMessages = function() {
RemoteToolsAgent.ClearConsoleMessages();
};
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 163f377..2963946 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -168,6 +168,9 @@ WebDevToolsClientImpl::WebDevToolsClientImpl(
dev_tools_host_->AddProtoFunction(
"activateWindow",
WebDevToolsClientImpl::JsActivateWindow);
+ dev_tools_host_->AddProtoFunction(
+ "getPlatform",
+ WebDevToolsClientImpl::JsGetPlatform);
dev_tools_host_->Build();
}
@@ -305,3 +308,15 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsActivateWindow(
client->delegate_->ActivateWindow();
return v8::Undefined();
}
+
+// static
+v8::Handle<v8::Value> WebDevToolsClientImpl::JsGetPlatform(
+ const v8::Arguments& args) {
+#if defined OS_MACOSX
+ return v8String("mac-leopard");
+#elif defined OS_LINUX
+ return v8String("linux");
+#else
+ return v8String("windows");
+#endif
+}
diff --git a/webkit/glue/webdevtoolsclient_impl.h b/webkit/glue/webdevtoolsclient_impl.h
index e71cbad..697a160 100644
--- a/webkit/glue/webdevtoolsclient_impl.h
+++ b/webkit/glue/webdevtoolsclient_impl.h
@@ -62,6 +62,7 @@ class WebDevToolsClientImpl : public WebDevToolsClient,
const v8::Arguments& args);
static v8::Handle<v8::Value> JsLoaded(const v8::Arguments& args);
static v8::Handle<v8::Value> JsActivateWindow(const v8::Arguments& args);
+ static v8::Handle<v8::Value> JsGetPlatform(const v8::Arguments& args);
WebViewImpl* web_view_impl_;
WebDevToolsClientDelegate* delegate_;