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

Update to API changes of Chrome 47

Browse source
This commit is contained in:
Cheng Zhao 2015-12-07 19:56:23 +08:00
parent 766bbfcb05
commit 73e7773d84
46 changed files with 113 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -410,7 +410,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
// be CPU bound, the page overly complex/large or the system just
// memory-bound.
static const int kPrinterSettingsTimeout = 60000;
base::OneShotTimer<base::MessageLoop> quit_timer;
base::OneShotTimer quit_timer;
quit_timer.Start(FROM_HERE,
TimeDelta::FromMilliseconds(kPrinterSettingsTimeout),
base::MessageLoop::current(), &base::MessageLoop::Quit);

2
chromium_src/chrome/browser/process_singleton_posix.cc
View file

@ -503,7 +503,7 @@ class ProcessSingleton::LinuxWatcher
// reads.
size_t bytes_read_;
base::OneShotTimer<SocketReader> timer_;
base::OneShotTimer timer_;
DISALLOW_COPY_AND_ASSIGN(SocketReader);
};

2
chromium_src/chrome/browser/speech/tts_controller_impl.cc
View file

@ -111,7 +111,7 @@ TtsController* TtsController::GetInstance() {
// static
TtsControllerImpl* TtsControllerImpl::GetInstance() {
return Singleton<TtsControllerImpl>::get();
return base::Singleton<TtsControllerImpl>::get();
}
TtsControllerImpl::TtsControllerImpl()

4
chromium_src/chrome/browser/speech/tts_controller_impl.h
View file

@ -77,7 +77,7 @@ class TtsControllerImpl : public TtsController {
int GetMatchingVoice(const Utterance* utterance,
std::vector<VoiceData>& voices);
friend struct DefaultSingletonTraits<TtsControllerImpl>;
friend struct base::DefaultSingletonTraits<TtsControllerImpl>;
// The current utterance being spoken.
Utterance* current_utterance_;
@ -101,4 +101,4 @@ class TtsControllerImpl : public TtsController {
DISALLOW_COPY_AND_ASSIGN(TtsControllerImpl);
};
#endif // CHROME_BROWSER_SPEECH_TTS_CONTROLLER_IMPL_H_
#endif // CHROME_BROWSER_SPEECH_TTS_CONTROLLER_IMPL_H_

4
chromium_src/chrome/browser/speech/tts_mac.mm
View file

@ -91,7 +91,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
int last_char_index_;
bool paused_;
friend struct DefaultSingletonTraits<TtsPlatformImplMac>;
friend struct base::DefaultSingletonTraits<TtsPlatformImplMac>;
DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplMac);
};
@ -291,7 +291,7 @@ TtsPlatformImplMac::~TtsPlatformImplMac() {
// static
TtsPlatformImplMac* TtsPlatformImplMac::GetInstance() {
return Singleton<TtsPlatformImplMac>::get();
return base::Singleton<TtsPlatformImplMac>::get();
}
@implementation ChromeTtsDelegate