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 /components | |
| 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 'components')
| -rw-r--r-- | components/filesystem/file_system_app.cc | 2 | ||||
| -rw-r--r-- | components/html_viewer/global_state.cc | 2 | ||||
| -rw-r--r-- | components/pdf_viewer/pdf_viewer.cc | 2 | ||||
| -rw-r--r-- | components/view_manager/view_manager_app.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc index c1e3e16..c42b606 100644 --- a/components/filesystem/file_system_app.cc +++ b/components/filesystem/file_system_app.cc @@ -67,7 +67,7 @@ void FileSystemApp::OnDirectoryConnectionError(DirectoryImpl* directory) { if (in_shutdown_ && client_mapping_.empty()) { // We just cleared the last directory after our shell connection went // away. Time to shut ourselves down. - app_->QuitNow(); + app_->Quit(); } return; diff --git a/components/html_viewer/global_state.cc b/components/html_viewer/global_state.cc index 870c4e7..b91ab73 100644 --- a/components/html_viewer/global_state.cc +++ b/components/html_viewer/global_state.cc @@ -93,7 +93,7 @@ void GlobalState::InitIfNecessary(const gfx::Size& screen_size_in_pixels, if (!resource_loader_.BlockUntilLoaded()) { // Assume on error we're being shut down. - app_->Terminate(); + app_->Quit(); return; } diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc index ad72eb0..f9ba728 100644 --- a/components/pdf_viewer/pdf_viewer.cc +++ b/components/pdf_viewer/pdf_viewer.cc @@ -432,7 +432,7 @@ class PDFView : public mojo::ApplicationDelegate, delete it->second; embedder_for_roots_.erase(it); if (embedder_for_roots_.size() == 0) - app_.Terminate(); + app_.Quit(); } void DrawBitmap(EmbedderData* embedder_data) { diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc index 4b092ad..5c5e77a 100644 --- a/components/view_manager/view_manager_app.cc +++ b/components/view_manager/view_manager_app.cc @@ -68,7 +68,7 @@ bool ViewManagerApp::ConfigureIncomingConnection( } void ViewManagerApp::OnNoMoreRootConnections() { - app_impl_->Terminate(); + app_impl_->Quit(); } ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView( |