diff options
-rw-r--r-- | webkit/glue/devtools/js/inspector_controller_impl.js | 8 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsclient_impl.cc | 15 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsclient_impl.h | 1 |
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_; |