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

refactor: use std::string instead of base::string16 for IPC channel names (#14286)

Browse source
This commit is contained in:
Milan Burda 2018-08-24 17:30:37 +02:00 • committed by Charles Kerr
parent 605a4570c1
commit e6e3ccfc50
12 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ RenderFrame* GetCurrentRenderFrame() {
}
void Send(mate::Arguments* args,
const base::string16& channel,
const std::string& channel,
const base::ListValue& arguments) {
RenderFrame* render_frame = GetCurrentRenderFrame();
if (render_frame == nullptr)
@ -42,7 +42,7 @@ void Send(mate::Arguments* args,
}
base::ListValue SendSync(mate::Arguments* args,
const base::string16& channel,
const std::string& channel,
const base::ListValue& arguments) {
base::ListValue result;

6
atom/renderer/api/atom_api_renderer_ipc.h
View file

@ -5,6 +5,8 @@
#ifndef ATOM_RENDERER_API_ATOM_API_RENDERER_IPC_H_
#define ATOM_RENDERER_API_ATOM_API_RENDERER_IPC_H_
#include <string>
#include "base/values.h"
#include "native_mate/arguments.h"
@ -13,11 +15,11 @@ namespace atom {
namespace api {
void Send(mate::Arguments* args,
const base::string16& channel,
const std::string& channel,
const base::ListValue& arguments);
base::ListValue SendSync(mate::Arguments* args,
const base::string16& channel,
const std::string& channel,
const base::ListValue& arguments);
void Initialize(v8::Local<v8::Object> exports,

4
atom/renderer/atom_render_frame_observer.cc
View file

@ -168,7 +168,7 @@ bool AtomRenderFrameObserver::OnMessageReceived(const IPC::Message& message) {
}
void AtomRenderFrameObserver::OnBrowserMessage(bool send_to_all,
const base::string16& channel,
const std::string& channel,
const base::ListValue& args) {
// Don't handle browser messages before document element is created.
// When we receive a message from the browser, we try to transfer it
@ -195,7 +195,7 @@ void AtomRenderFrameObserver::OnBrowserMessage(bool send_to_all,
}
void AtomRenderFrameObserver::EmitIPCEvent(blink::WebLocalFrame* frame,
const base::string16& channel,
const std::string& channel,
const base::ListValue& args) {
if (!frame)
return;

6
atom/renderer/atom_render_frame_observer.h
View file

@ -5,6 +5,8 @@
#ifndef ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
#define ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
#include <string>
#include "atom/renderer/renderer_client_base.h"
#include "base/strings/string16.h"
#include "content/public/renderer/render_frame_observer.h"
@ -42,7 +44,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
protected:
virtual void EmitIPCEvent(blink::WebLocalFrame* frame,
const base::string16& channel,
const std::string& channel,
const base::ListValue& args);
private:
@ -51,7 +53,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
bool IsMainWorld(int world_id);
bool IsIsolatedWorld(int world_id);
void OnBrowserMessage(bool send_to_all,
const base::string16& channel,
const std::string& channel,
const base::ListValue& args);
content::RenderFrame* render_frame_;

2
atom/renderer/atom_sandboxed_renderer_client.cc
View file

@ -106,7 +106,7 @@ class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
protected:
void EmitIPCEvent(blink::WebLocalFrame* frame,
const base::string16& channel,
const std::string& channel,
const base::ListValue& args) override {
if (!frame)
return;