diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index d2fb15fa7912..dd03e1802fbd 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -40,7 +40,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/common/content_switches.h" #include "media/audio/audio_manager.h" -#include "native_mate/dictionary.h" #include "native_mate/object_template_builder.h" #include "net/ssl/ssl_cert_request_info.h" #include "ui/base/l10n/l10n_util.h" @@ -924,7 +923,7 @@ void App::GetFileIcon(const base::FilePath& path, } } -v8::Local App::GetAppMemoryInfo(v8::Isolate* isolate) { +std::vector App::GetAppMemoryInfo(v8::Isolate* isolate) { AppIdProcessIterator process_iterator; auto processEntry = process_iterator.NextProcessEntry(); std::vector result; @@ -962,7 +961,7 @@ v8::Local App::GetAppMemoryInfo(v8::Isolate* isolate) { processEntry = process_iterator.NextProcessEntry(); } - return mate::ConvertToV8(isolate, result); + return result; } // static diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h index 240c3b200691..9543e4b74b22 100644 --- a/atom/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -18,6 +18,7 @@ #include "chrome/browser/icon_manager.h" #include "chrome/browser/process_singleton.h" #include "content/public/browser/gpu_data_manager_observer.h" +#include "native_mate/dictionary.h" #include "native_mate/handle.h" #include "net/base/completion_callback.h" @@ -142,7 +143,7 @@ class App : public AtomBrowserClient::Delegate, void GetFileIcon(const base::FilePath& path, mate::Arguments* args); - v8::Local GetAppMemoryInfo(v8::Isolate* isolate); + std::vector GetAppMemoryInfo(v8::Isolate* isolate); #if defined(OS_WIN) // Get the current Jump List settings.