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

Update to API changes of Chrome 51

Browse source
This commit is contained in:
Cheng Zhao 2016-05-23 10:59:39 +09:00
parent 05c2999651
commit 7ba391da7c
87 changed files with 225 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ void WebFrame::ExecuteJavaScript(const base::string16& code,
args->GetNext(&has_user_gesture);
ScriptExecutionCallback::CompletionCallback completion_callback;
args->GetNext(&completion_callback);
scoped_ptr<blink::WebScriptExecutionCallback> callback(
std::unique_ptr<blink::WebScriptExecutionCallback> callback(
new ScriptExecutionCallback(completion_callback));
web_frame_->requestExecuteScriptAndReturnValue(
blink::WebScriptSource(code),

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

@ -74,7 +74,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
blink::WebCache::ResourceTypeStats GetResourceUsage(v8::Isolate* isolate);
void ClearCache(v8::Isolate* isolate);
scoped_ptr<SpellCheckClient> spell_check_client_;
std::unique_ptr<SpellCheckClient> spell_check_client_;
blink::WebLocalFrame* web_frame_;

6
atom/renderer/atom_renderer_client.cc
View file

@ -95,15 +95,11 @@ AtomRendererClient::AtomRendererClient()
AtomRendererClient::~AtomRendererClient() {
}
void AtomRendererClient::WebKitInitialized() {
void AtomRendererClient::RenderThreadStarted() {
blink::WebCustomElement::addEmbedderCustomElementName("webview");
blink::WebCustomElement::addEmbedderCustomElementName("browserplugin");
OverrideNodeArrayBuffer();
}
void AtomRendererClient::RenderThreadStarted() {
content::RenderThread::Get()->AddObserver(this);
#if defined(OS_WIN)
// Set ApplicationUserModelID in renderer process.

11
atom/renderer/atom_renderer_client.h
View file

@ -9,15 +9,13 @@
#include <vector>
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/renderer/render_process_observer.h"
namespace atom {
class AtomBindings;
class NodeBindings;
class AtomRendererClient : public content::ContentRendererClient,
public content::RenderProcessObserver {
class AtomRendererClient : public content::ContentRendererClient {
public:
AtomRendererClient();
virtual ~AtomRendererClient();
@ -33,9 +31,6 @@ class AtomRendererClient : public content::ContentRendererClient,
DISABLE,
};
// content::RenderProcessObserver:
void WebKitInitialized() override;
// content::ContentRendererClient:
void RenderThreadStarted() override;
void RenderFrameCreated(content::RenderFrame*) override;
@ -64,8 +59,8 @@ class AtomRendererClient : public content::ContentRendererClient,
std::string* error_html,
base::string16* error_description) override;
scoped_ptr<NodeBindings> node_bindings_;
scoped_ptr<AtomBindings> atom_bindings_;
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_;
DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
};