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

Removed QuitWhenIdle

Browse source
This commit is contained in:
Tomas Rycl 2017-11-24 13:25:54 +00:00 • committed by Cheng Zhao
parent b02edd014a
commit 60f69ad77b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -324,7 +324,7 @@ void PrintViewManagerBase::ShouldQuitFromInnerMessageLoop() {
inside_inner_message_loop_) { inside_inner_message_loop_) {
// We are in a message loop created by RenderAllMissingPagesNow. Quit from // We are in a message loop created by RenderAllMissingPagesNow. Quit from
// it. // it.
base::MessageLoop::current()->QuitWhenIdle(); base::RunLoop::QuitCurrentWhenIdleDeprecated();
inside_inner_message_loop_ = false; inside_inner_message_loop_ = false;
} }
} }
@ -433,9 +433,10 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
// memory-bound. // memory-bound.
static const int kPrinterSettingsTimeout = 60000; static const int kPrinterSettingsTimeout = 60000;
base::OneShotTimer quit_timer; base::OneShotTimer quit_timer;
quit_timer.Start( base::RunLoop run_loop;
FROM_HERE, TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), quit_timer.Start(FROM_HERE,
base::MessageLoop::current(), &base::MessageLoop::QuitWhenIdle); TimeDelta::FromMilliseconds(kPrinterSettingsTimeout),
run_loop.QuitWhenIdleClosure());
inside_inner_message_loop_ = true; inside_inner_message_loop_ = true;