mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Also add closeDevTools and isDevToolsOpened for webview

Browse source
This commit is contained in:
Cheng Zhao 2014-11-03 22:12:56 +08:00
parent accd08a2bf
commit 4ebe58df57
5 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/api/atom_api_web_contents.cc
View file

@ -10,9 +10,8 @@
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "atom/browser/atom_javascript_dialog_manager.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "base/strings/utf_string_conversions.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
@ -375,6 +374,14 @@ void WebContents::OpenDevTools() {
storage_->ShowDevTools();
}
void WebContents::CloseDevTools() {
storage_->CloseDevTools();
}
bool WebContents::IsDevToolsOpened() {
return storage_->IsDevToolsViewShowing();
}
bool WebContents::SendIPCMessage(const base::string16& channel,
const base::ListValue& args) {
return Send(new AtomViewMsg_Message(routing_id(), channel, args));
@ -450,6 +457,8 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
.SetMethod("setAllowTransparency", &WebContents::SetAllowTransparency)
.SetMethod("isGuest", &WebContents::is_guest)
.SetMethod("openDevTools", &WebContents::OpenDevTools)
.SetMethod("closeDevTools", &WebContents::CloseDevTools)
.SetMethod("isDevToolsOpened", &WebContents::IsDevToolsOpened)
.Build());
return mate::ObjectTemplateBuilder(

12
atom/browser/api/atom_api_web_contents.h
View file

@ -8,20 +8,20 @@
#include <string>
#include "atom/browser/api/event_emitter.h"
#include "brightray/browser/default_web_contents_delegate.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
#include "brightray/browser/default_web_contents_delegate.h"
#include "native_mate/handle.h"
namespace mate {
class Dictionary;
}
namespace brightray {
class InspectableWebContents;
}
namespace mate {
class Dictionary;
}
namespace atom {
namespace api {
@ -63,6 +63,8 @@ class WebContents : public mate::EventEmitter,
void InsertCSS(const std::string& css);
void ExecuteJavaScript(const base::string16& code);
void OpenDevTools();
void CloseDevTools();
bool IsDevToolsOpened();
bool SendIPCMessage(const base::string16& channel,
const base::ListValue& args);

2
atom/renderer/lib/web-view.coffee
View file

@ -519,6 +519,8 @@ registerWebViewElement = ->
"executeJavaScript"
"insertCSS",
"openDevTools",
"closeDevTools",
"isDevToolsOpened",
"send"
]

12
docs/api/web-view-tag.md
View file

@ -167,11 +167,19 @@ Injects CSS into guest page.
* `code` String
Evaluate `code` in guest page.
Evaluates `code` in guest page.
### `<webview>`.openDevTools()
Open a devtools instance for the webview's contents.
Opens a devtools window for guest page.
### `<webview>`.closeDevTools()
Closes the devtools window of guest page.
### `<webview>`.isDevToolsOpened()
Returns whether guest page has a devtools window attached.
### `<webview>`.send(channel[, args...])

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 90d2649bdd02ac544c79dc24802f7914370e833a
Subproject commit 52b2a6bfac3e5e1527c0dcfba6f5a5d2aa6ad9dd