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

Return mate::Dictionary instead of v8::value

Browse source
This commit is contained in:
Hari Krishna Reddy Juturu 2017-04-27 21:07:35 -07:00
parent 88ad28b2a5
commit 07b53c0284
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_app.cc
View file

@ -40,7 +40,6 @@
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "media/audio/audio_manager.h" #include "media/audio/audio_manager.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_cert_request_info.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
@ -924,7 +923,7 @@ void App::GetFileIcon(const base::FilePath& path,
} }
} }
v8::Local<v8::Value> App::GetAppMemoryInfo(v8::Isolate* isolate) { std::vector<mate::Dictionary> App::GetAppMemoryInfo(v8::Isolate* isolate) {
AppIdProcessIterator process_iterator; AppIdProcessIterator process_iterator;
auto processEntry = process_iterator.NextProcessEntry(); auto processEntry = process_iterator.NextProcessEntry();
std::vector<mate::Dictionary> result; std::vector<mate::Dictionary> result;
@ -962,7 +961,7 @@ v8::Local<v8::Value> App::GetAppMemoryInfo(v8::Isolate* isolate) {
processEntry = process_iterator.NextProcessEntry(); processEntry = process_iterator.NextProcessEntry();
} }
return mate::ConvertToV8(isolate, result); return result;
} }
// static // static

3
atom/browser/api/atom_api_app.h
View file

@ -18,6 +18,7 @@
#include "chrome/browser/icon_manager.h" #include "chrome/browser/icon_manager.h"
#include "chrome/browser/process_singleton.h" #include "chrome/browser/process_singleton.h"
#include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/browser/gpu_data_manager_observer.h"
#include "native_mate/dictionary.h"
#include "native_mate/handle.h" #include "native_mate/handle.h"
#include "net/base/completion_callback.h" #include "net/base/completion_callback.h"
@ -142,7 +143,7 @@ class App : public AtomBrowserClient::Delegate,
void GetFileIcon(const base::FilePath& path, void GetFileIcon(const base::FilePath& path,
mate::Arguments* args); mate::Arguments* args);
v8::Local<v8::Value> GetAppMemoryInfo(v8::Isolate* isolate); std::vector<mate::Dictionary> GetAppMemoryInfo(v8::Isolate* isolate);
#if defined(OS_WIN) #if defined(OS_WIN)
// Get the current Jump List settings. // Get the current Jump List settings.