Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: mojo/services/window_manager/window_manager_app.cc

Issue 421473002: Re-enable mojo_core_window_manager_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/window_manager/window_manager_api_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/window_manager/window_manager_app.cc
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index 42c9e03fa14543ad92db5a3c34699dcda86c88d2..cddc33fb9e628d3147a3d141ef53030ed0229391 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -171,7 +171,8 @@ void WindowManagerApp::OnRootAdded(ViewManager* view_manager,
focus_client_->AddObserver(this);
activation_client_->AddObserver(this);
- wrapped_delegate_->OnRootAdded(view_manager, root);
+ if (wrapped_delegate_)
jamesr 2014/07/25 00:20:29 after https://codereview.chromium.org/400113005, t
+ wrapped_delegate_->OnRootAdded(view_manager, root);
for (Connections::const_iterator it = connections_.begin();
it != connections_.end(); ++it) {
@@ -182,7 +183,8 @@ void WindowManagerApp::OnRootAdded(ViewManager* view_manager,
void WindowManagerApp::OnViewManagerDisconnected(
ViewManager* view_manager) {
DCHECK_EQ(view_manager_, view_manager);
- wrapped_delegate_->OnViewManagerDisconnected(view_manager);
+ if (wrapped_delegate_)
+ wrapped_delegate_->OnViewManagerDisconnected(view_manager);
root_->RemoveObserver(this);
root_ = NULL;
view_manager_ = NULL;
« no previous file with comments | « mojo/services/window_manager/window_manager_api_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698