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

Merge branch 'master' into chrome52

Browse source
This commit is contained in:
Cheng Zhao 2016-07-21 05:34:36 -06:00
commit b57665330c
203 changed files with 2352 additions and 1220 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/renderer/api/atom_api_renderer_ipc.cc
View file

@ -20,11 +20,11 @@ namespace {
RenderView* GetCurrentRenderView() {
WebLocalFrame* frame = WebLocalFrame::frameForCurrentContext();
if (!frame)
return NULL;
return nullptr;
WebView* view = frame->view();
if (!view)
return NULL; // can happen during closing.
return nullptr; // can happen during closing.
return RenderView::FromWebView(view);
}
@ -33,7 +33,7 @@ void Send(mate::Arguments* args,
const base::string16& channel,
const base::ListValue& arguments) {
RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
if (render_view == nullptr)
return;
bool success = render_view->Send(new AtomViewHostMsg_Message(
@ -49,7 +49,7 @@ base::string16 SendSync(mate::Arguments* args,
base::string16 json;
RenderView* render_view = GetCurrentRenderView();
if (render_view == NULL)
if (render_view == nullptr)
return json;
IPC::SyncMessage* message = new AtomViewHostMsg_Message_Sync(

2
atom/renderer/api/atom_api_web_frame.cc
View file

@ -39,7 +39,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
explicit ScriptExecutionCallback(const CompletionCallback& callback)
: callback_(callback) {}
~ScriptExecutionCallback() {}
~ScriptExecutionCallback() override {}
void completed(
const blink::WebVector<v8::Local<v8::Value>>& result) override {