From 6d8f9009168d2c6bffc1f734e43c5f6ee504d942 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 6 Sep 2016 19:55:18 +0900 Subject: [PATCH] Fix building on Windows --- atom/browser/api/atom_api_download_item.cc | 3 ++- atom/browser/api/atom_api_power_monitor.cc | 3 ++- .../chrome/browser/printing/pdf_to_emf_converter.cc | 2 -- .../chrome/browser/printing/print_view_manager_base.cc | 3 ++- chromium_src/chrome/common/chrome_paths.cc | 2 +- chromium_src/chrome/common/chrome_utility_messages.h | 6 +++--- .../renderer/printing/print_web_view_helper_pdf_win.cc | 2 +- vendor/brightray | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/atom/browser/api/atom_api_download_item.cc b/atom/browser/api/atom_api_download_item.cc index 05261a64f08..d11e5a3add7 100644 --- a/atom/browser/api/atom_api_download_item.cc +++ b/atom/browser/api/atom_api_download_item.cc @@ -10,12 +10,13 @@ #include "atom/common/native_mate_converters/callback.h" #include "atom/common/native_mate_converters/file_path_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/strings/utf_string_conversions.h" #include "native_mate/dictionary.h" #include "net/base/filename_util.h" +#include "atom/common/node_includes.h" + namespace mate { template<> diff --git a/atom/browser/api/atom_api_power_monitor.cc b/atom/browser/api/atom_api_power_monitor.cc index 02b61e8f4bb..a30f0bcb4bb 100644 --- a/atom/browser/api/atom_api_power_monitor.cc +++ b/atom/browser/api/atom_api_power_monitor.cc @@ -5,11 +5,12 @@ #include "atom/browser/api/atom_api_power_monitor.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_device_source.h" #include "native_mate/dictionary.h" +#include "atom/common/node_includes.h" + namespace atom { namespace api { diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc index 0d23a7c6d5a..7c9f199459d 100644 --- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc @@ -109,8 +109,6 @@ class PdfToEmfUtilityProcessHostClient private: class GetPageCallbackData { - MOVE_ONLY_TYPE_FOR_CPP_03(GetPageCallbackData); - public: GetPageCallbackData(int page_number, PdfToEmfConverter::GetPageCallback callback) diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc index 71c5d9ce494..0638bd5c4d4 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc @@ -7,9 +7,10 @@ #include #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/timer/timer.h" +#include "components/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" diff --git a/chromium_src/chrome/common/chrome_paths.cc b/chromium_src/chrome/common/chrome_paths.cc index 079b10c4383..d373315beb0 100644 --- a/chromium_src/chrome/common/chrome_paths.cc +++ b/chromium_src/chrome/common/chrome_paths.cc @@ -365,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_COMPONENT_WIDEVINE_CDM: if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; - cur = cur.Append(kWidevineCdmBaseDirectory); + cur = cur.AppendASCII(kWidevineCdmBaseDirectory); break; #endif // defined(WIDEVINE_CDM_IS_COMPONENT) // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings. diff --git a/chromium_src/chrome/common/chrome_utility_messages.h b/chromium_src/chrome/common/chrome_utility_messages.h index f146e1823e8..efcd468c513 100644 --- a/chromium_src/chrome/common/chrome_utility_messages.h +++ b/chromium_src/chrome/common/chrome_utility_messages.h @@ -9,11 +9,11 @@ #endif // defined(OS_WIN) #include +#include #include #include "base/files/file_path.h" #include "base/strings/string16.h" -#include "base/tuple.h" #include "base/values.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" @@ -25,9 +25,9 @@ #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_ #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"). -typedef std::vector> +typedef std::vector> GetOpenFileNameFilter; #endif // OS_WIN diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc index 7d5d3b8b06f..6c31313f0d6 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc @@ -31,7 +31,7 @@ bool PrintWebViewHelper::RenderPreviewPage( std::unique_ptr draft_metafile; PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile(); 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(); } diff --git a/vendor/brightray b/vendor/brightray index 21429157539..7347785fca0 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 214291575395dadeb4dc2ee887398c17561b1f59 +Subproject commit 7347785fca0bf7a1b7ef27c7a476008563bdaa00