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

Fix compilation error on OS X.

Browse source
This commit is contained in:
Haojian Wu 2015-05-04 20:58:48 +08:00
parent ff87592722
commit 298d3a0144
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/app/atom_main_delegate.cc
View file

@ -10,11 +10,11 @@
#include "atom/browser/atom_browser_client.h"
#include "atom/common/google_api_key.h"
#include "atom/renderer/atom_renderer_client.h"
#include "atom/utility/atom_content_utility_client.h"
#include "base/command_line.h"
#include "base/debug/stack_trace.h"
#include "base/environment.h"
#include "base/logging.h"
#include "chrome/utility/chrome_content_utility_client.h"
#include "content/public/common/content_switches.h"
#include "ui/base/resource/resource_bundle.h"
@ -96,10 +96,8 @@ content::ContentRendererClient*
}
content::ContentUtilityClient* AtomMainDelegate::CreateContentUtilityClient() {
#if defined(OS_WIN)
utility_client_.reset(new AtomContentUtilityClient);
return utility_client_.get();
#endif
}
scoped_ptr<brightray::ContentClient> AtomMainDelegate::CreateContentClient() {

6
atom/utility/atom_content_utility_client.cc
View file

@ -27,10 +27,6 @@ bool Send(IPC::Message* message) {
return content::UtilityThread::Get()->Send(message);
}
void ReleaseProcessIfNeeded() {
content::UtilityThread::Get()->ReleaseProcessIfNeeded();
}
} // namespace
namespace atom {
@ -40,7 +36,9 @@ int64_t AtomContentUtilityClient::max_ipc_message_size_ =
AtomContentUtilityClient::AtomContentUtilityClient()
: filter_messages_(false) {
#if defined(OS_WIN)
handlers_.push_back(new PrintingHandler());
#endif
}
AtomContentUtilityClient::~AtomContentUtilityClient() {

8
filenames.gypi
View file

@ -293,8 +293,6 @@
'chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h',
'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.cc',
'chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h',
'chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc',
'chromium_src/chrome/browser/printing/pdf_to_emf_converter.h',
'chromium_src/chrome/browser/printing/print_job.cc',
'chromium_src/chrome/browser/printing/print_job.h',
'chromium_src/chrome/browser/printing/print_job_manager.cc',
@ -343,8 +341,6 @@
'chromium_src/chrome/renderer/spellchecker/spellcheck_worditerator.h',
'chromium_src/chrome/renderer/tts_dispatcher.cc',
'chromium_src/chrome/renderer/tts_dispatcher.h',
'chromium_src/chrome/utility/printing_handler.cc',
'chromium_src/chrome/utility/printing_handler.h',
'chromium_src/chrome/utility/utility_message_handler.h',
'chromium_src/library_loaders/libspeechd_loader.cc',
'chromium_src/library_loaders/libspeechd.h',
@ -355,6 +351,10 @@
'chromium_src/chrome/browser/ui/views/color_chooser_dialog.cc',
'chromium_src/chrome/browser/ui/views/color_chooser_dialog.h',
'chromium_src/chrome/browser/ui/views/color_chooser_win.cc',
'chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc',
'chromium_src/chrome/browser/printing/pdf_to_emf_converter.h',
'chromium_src/chrome/utility/printing_handler.cc',
'chromium_src/chrome/utility/printing_handler.h',
],
'framework_sources': [
'atom/app/atom_library_main.h',