summaryrefslogtreecommitdiffstats
path: root/device/devices_app
diff options
context:
space:
mode:
authordzhioev <dzhioev@chromium.org>2015-07-29 18:57:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 01:57:45 +0000
commit43dad577a3dec647c2c3bd1b5e6b61bc138100e0 (patch)
treeaf3b6bdad7fbaef0b84f26961d2f2119496fc49c /device/devices_app
parent3865c64ae77925ee6b23de9aa61bd987871df13c (diff)
downloadchromium_src-43dad577a3dec647c2c3bd1b5e6b61bc138100e0.zip
chromium_src-43dad577a3dec647c2c3bd1b5e6b61bc138100e0.tar.gz
chromium_src-43dad577a3dec647c2c3bd1b5e6b61bc138100e0.tar.bz2
Revert of ApplicationImpl cleanup, part 1: (patchset #4 id:60001 of https://codereview.chromium.org/1266643003/)
Reason for revert: Breaks Linux build: [1240/8599] CXX obj/components/pdf_viewer/libpdf_viewer_library/pdf_viewer.o FAILED: /mnt/data/b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/components/pdf_viewer/libpdf_viewer_library/pdf_viewer.o.d -DGL_GLEXT_PROTOTYPES -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -DENABLE_MDNS=1 -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DDONT_EMBED_BUILD_METADATA -DUSE_UDEV -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_ASH=1 -DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_CLIPBOARD_AURAX11=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_GLIB=1 -DUSE_OPENSSL=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_REMOTING=1 -DENABLE_GOOGLE_NOW=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_HIDPI=1 -DENABLE_TOPCHROME_MD=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DENABLE_BACKGROUND=1 -DENABLE_PRE_SYNC_BACKUP -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DCR_CLANG_REVISION=242792-1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DGL_GLEXT_PROTOTYPES -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_LEGACY_SKPOINT3_CTORS -DSK_SUPPORT_GPU=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DGLES2_USE_MOJO -I../.. -Igen -I../../third_party/mojo/src -Igen/third_party/mojo/src -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I../../third_party/khronos -I../../gpu -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../mojo/services -Igen/mojo/services -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -m64 -march=x86-64 -funwind-tables -fPIC -pipe -pthread -B../../third_party/binutils/Linux_x64/Release/bin -fcolor-diagnostics -Wall -Wsign-compare -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-char-subscripts -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-reserved-user-defined-literal -Wno-inconsistent-missing-override -Wno-shift-negative-value -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -O2 -fno-ident -fdata-sections -ffunction-sections -g1 -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -c ../../components/pdf_viewer/pdf_viewer.cc -o obj/components/pdf_viewer/libpdf_viewer_library/pdf_viewer.o ../../components/pdf_viewer/pdf_viewer.cc:435:12: error: no member named 'Terminate' in 'mojo::ApplicationImpl' app_.Terminate(); ~~~~ ^ 1 error generated. ninja: build stopped: subcommand failed. Original issue's description: > ApplicationImpl cleanup, part 1: > - Remove ctor that does not take a termination closure. > - Terminate()->Quit() > - QuitNow()->private > > R=jam@chromium.org > BUG=none > > Committed: https://crrev.com/46e34f6bc1c8424c383776e5961094c5df5d563b > Cr-Commit-Position: refs/heads/master@{#341028} TBR=jam@chromium.org,thestig@chromium.org,ben@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/1257703003 Cr-Commit-Position: refs/heads/master@{#341036}
Diffstat (limited to 'device/devices_app')
-rw-r--r--device/devices_app/devices_app.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc
index 4501f75..1f49170 100644
--- a/device/devices_app/devices_app.cc
+++ b/device/devices_app/devices_app.cc
@@ -156,7 +156,7 @@ void DevicesApp::StartIdleTimer() {
// Passing unretained |app_impl_| is safe here because |app_impl_| is
// guaranteed to outlive |this|, and the callback is canceled if |this| is
// destroyed.
- idle_timeout_callback_.Reset(base::Bind(&mojo::ApplicationImpl::Quit,
+ idle_timeout_callback_.Reset(base::Bind(&mojo::ApplicationImpl::Terminate,
base::Unretained(app_impl_)));
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, idle_timeout_callback_.callback(),