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

Fix building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-09-06 19:55:18 +09:00
parent 4aa292c7cd
commit 6d8f900916
8 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_download_item.cc
View file

@ -10,12 +10,13 @@
#include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/callback.h"
#include "atom/common/native_mate_converters/file_path_converter.h" #include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/node_includes.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "net/base/filename_util.h" #include "net/base/filename_util.h"
#include "atom/common/node_includes.h"
namespace mate { namespace mate {
template<> template<>

3
atom/browser/api/atom_api_power_monitor.cc
View file

@ -5,11 +5,12 @@
#include "atom/browser/api/atom_api_power_monitor.h" #include "atom/browser/api/atom_api_power_monitor.h"
#include "atom/browser/browser.h" #include "atom/browser/browser.h"
#include "atom/common/node_includes.h"
#include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor.h"
#include "base/power_monitor/power_monitor_device_source.h" #include "base/power_monitor/power_monitor_device_source.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "atom/common/node_includes.h"
namespace atom { namespace atom {
namespace api { namespace api {

2
chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc
View file

@ -109,8 +109,6 @@ class PdfToEmfUtilityProcessHostClient
private: private:
class GetPageCallbackData { class GetPageCallbackData {
MOVE_ONLY_TYPE_FOR_CPP_03(GetPageCallbackData);
public: public:
GetPageCallbackData(int page_number, GetPageCallbackData(int page_number,
PdfToEmfConverter::GetPageCallback callback) PdfToEmfConverter::GetPageCallback callback)

3
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -7,9 +7,10 @@
#include <memory> #include <memory>
#include "base/bind.h" #include "base/bind.h"
#include "components/prefs/pref_service.h" #include "base/memory/ref_counted_memory.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "components/prefs/pref_service.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/printing/print_job.h" #include "chrome/browser/printing/print_job.h"

2
chromium_src/chrome/common/chrome_paths.cc
View file

@ -365,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
case chrome::DIR_COMPONENT_WIDEVINE_CDM: case chrome::DIR_COMPONENT_WIDEVINE_CDM:
if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
return false; return false;
cur = cur.Append(kWidevineCdmBaseDirectory); cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
break; break;
#endif // defined(WIDEVINE_CDM_IS_COMPONENT) #endif // defined(WIDEVINE_CDM_IS_COMPONENT)
// TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings. // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.

6
chromium_src/chrome/common/chrome_utility_messages.h
View file

@ -9,11 +9,11 @@
#endif // defined(OS_WIN) #endif // defined(OS_WIN)
#include <string> #include <string>
#include <tuple>
#include <vector> #include <vector>
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/tuple.h"
#include "base/values.h" #include "base/values.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "ipc/ipc_platform_file.h" #include "ipc/ipc_platform_file.h"
@ -25,9 +25,9 @@
#define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_ #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
#if defined(OS_WIN) #if defined(OS_WIN)
// A vector of filters, each being a Tuple containing a display string (i.e. // A vector of filters, each being a tuple containing a display string (i.e.
// "Text Files") and a filter pattern (i.e. "*.txt"). // "Text Files") and a filter pattern (i.e. "*.txt").
typedef std::vector<base::Tuple<base::string16, base::string16>> typedef std::vector<std::tuple<base::string16, base::string16>>
GetOpenFileNameFilter; GetOpenFileNameFilter;
#endif // OS_WIN #endif // OS_WIN

2
chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
View file

@ -31,7 +31,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
std::unique_ptr<PdfMetafileSkia> draft_metafile; std::unique_ptr<PdfMetafileSkia> draft_metafile;
PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile(); PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) { if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
draft_metafile.reset(new PdfMetafileSkia); draft_metafile.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
initial_render_metafile = draft_metafile.get(); initial_render_metafile = draft_metafile.get();
} }

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 214291575395dadeb4dc2ee887398c17561b1f59 Subproject commit 7347785fca0bf7a1b7ef27c7a476008563bdaa00