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

Fix up Windows build errors

Browse source
This commit is contained in:
Paul Betts 2015-12-07 10:02:06 -08:00
parent d0be6c7411
commit 3931ebb7ef
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chromium_src/chrome/browser/speech/tts_win.cc
View file

@ -57,7 +57,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
int char_position_;
bool paused_;
friend struct DefaultSingletonTraits<TtsPlatformImplWin>;
friend struct base::DefaultSingletonTraits<TtsPlatformImplWin>;
DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplWin);
};
@ -246,12 +246,12 @@ TtsPlatformImplWin::TtsPlatformImplWin()
// static
TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() {
return Singleton<TtsPlatformImplWin,
LeakySingletonTraits<TtsPlatformImplWin> >::get();
return base::Singleton< TtsPlatformImplWin,
base::LeakySingletonTraits<TtsPlatformImplWin> >::get();
}
// static
void TtsPlatformImplWin::SpeechEventCallback(
WPARAM w_param, LPARAM l_param) {
GetInstance()->OnSpeechEvent();
}
}

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

@ -135,7 +135,6 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebFrame* frame,
printed_page_params.page_size = page_size_in_dpi[i];
printed_page_params.content_area = content_area_in_dpi[i];
Send(new PrintHostMsg_DidPrintPage(routing_id(), printed_page_params));
printed_page_params.metafile_data_handle = INVALID_HANDLE_VALUE;
}
return true;
}