diff options
| author | ben <ben@chromium.org> | 2015-08-10 12:35:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-10 19:36:45 +0000 |
| commit | c688d2ebd66cb1fc7d85c478d3858329fbc194b3 (patch) | |
| tree | 648e1c33a791d971cd76cfdc595aee6e603682fe /device/devices_app | |
| parent | 4e9da313512a86d4ace1c211eaf4dc5da6d6f307 (diff) | |
| download | chromium_src-c688d2ebd66cb1fc7d85c478d3858329fbc194b3.zip chromium_src-c688d2ebd66cb1fc7d85c478d3858329fbc194b3.tar.gz chromium_src-c688d2ebd66cb1fc7d85c478d3858329fbc194b3.tar.bz2 | |
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}
Review URL: https://codereview.chromium.org/1266643003
Cr-Commit-Position: refs/heads/master@{#342676}
Diffstat (limited to 'device/devices_app')
| -rw-r--r-- | device/devices_app/devices_app.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc index 1f49170..4501f75 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::Terminate, + idle_timeout_callback_.Reset(base::Bind(&mojo::ApplicationImpl::Quit, base::Unretained(app_impl_))); base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, idle_timeout_callback_.callback(), |