diff options
| author | rockot <rockot@chromium.org> | 2015-04-14 20:48:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-15 03:49:11 +0000 |
| commit | b46eeca5f6b2a8840836586503440a8f8d9f6605 (patch) | |
| tree | 66d980fde20ec24f9c31013e85137d0486f92194 /third_party/mojo_services | |
| parent | a2299dd0efd411cf9b615939490d942975a4d0dd (diff) | |
| download | chromium_src-b46eeca5f6b2a8840836586503440a8f8d9f6605.zip chromium_src-b46eeca5f6b2a8840836586503440a8f8d9f6605.tar.gz chromium_src-b46eeca5f6b2a8840836586503440a8f8d9f6605.tar.bz2 | |
Update mojo sdk to rev dcd8c63adaf8bd5c89bd21ddb439aa8651da32dc
Trivial roll. Including //mojo/android this time and adding +build to third_party/mojo/src/mojo/public/DEPS.
BUG=None
TBR=sky@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/1082343002
Cr-Commit-Position: refs/heads/master@{#325182}
Diffstat (limited to 'third_party/mojo_services')
| -rw-r--r-- | third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc | 7 | ||||
| -rw-r--r-- | third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc index b0d4b33..77dc293 100644 --- a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc +++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc @@ -216,6 +216,13 @@ void ViewManagerClientImpl::AddView(View* view) { } void ViewManagerClientImpl::RemoveView(Id view_id) { + if (focused_view_ && focused_view_->id() == view_id) + OnFocusChanged(0); + if (capture_view_ && capture_view_->id() == view_id) + OnCaptureChanged(0); + if (activated_view_ && activated_view_->id() == view_id) + OnActiveWindowChanged(0); + IdToViewMap::iterator it = views_.find(view_id); if (it != views_.end()) views_.erase(it); diff --git a/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn b/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn index 0adbb5d..f0d8071 100644 --- a/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn +++ b/third_party/mojo_services/src/view_manager/public/cpp/tests/BUILD.gn @@ -16,12 +16,16 @@ test("mojo_view_manager_lib_unittests") { deps = [ "//base", "//base/test:test_support", + # TODO(vtl): These non-public deps are illegal here. This should be + # converted to an apptest. + "//mojo/application", + "//mojo/edk/system", + "//mojo/environment:chromium", "//mojo/public/cpp/application", "//mojo/public/cpp/system", "//mojo/services/geometry/public/cpp", "//mojo/services/geometry/public/interfaces", "//mojo/services/view_manager/public/cpp", - "//shell:test_support", "//testing/gtest", ] |