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

Remove use of native_type_conversions.h when possible.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-21 23:49:53 +08:00
parent 2efed6f910
commit 7e1c86a105
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_menu_mac.mm
View file

@ -4,14 +4,14 @@
#import "atom/browser/api/atom_api_menu_mac.h" #import "atom/browser/api/atom_api_menu_mac.h"
#include "atom/browser/native_window.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "atom/browser/native_window.h"
#include "atom/common/node_includes.h"
#include "atom/common/v8/native_type_conversions.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h"
#include "atom/common/node_includes.h"
namespace atom { namespace atom {
namespace api { namespace api {

4
atom/common/node_bindings.cc
View file

@ -8,10 +8,10 @@
#include <vector> #include <vector>
#include "atom/common/browser_v8_locker.h" #include "atom/common/browser_v8_locker.h"
#include "atom/common/v8/native_type_conversions.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"

7
atom/renderer/api/atom_renderer_bindings.cc
View file

@ -6,7 +6,10 @@
#include <vector> #include <vector>
#include "atom/common/v8/native_type_conversions.h" #include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/native_mate_converters/v8_value_converter.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebView.h"
@ -64,7 +67,7 @@ void AtomRendererBindings::OnBrowserMessage(content::RenderView* render_view,
std::vector<v8::Handle<v8::Value>> arguments; std::vector<v8::Handle<v8::Value>> arguments;
arguments.reserve(1 + args.GetSize()); arguments.reserve(1 + args.GetSize());
arguments.push_back(ToV8Value(channel)); arguments.push_back(mate::ConvertToV8(node_isolate, channel));
for (size_t i = 0; i < args.GetSize(); i++) { for (size_t i = 0; i < args.GetSize(); i++) {
const base::Value* value; const base::Value* value;