Commit a4e4c6a5 authored by qsr@chromium.org's avatar qsr@chromium.org

Fix mojo build on android.

Android stl library has bugs related to std::set ->
https://code.google.com/p/android/issues/detail?id=69153

This change allow this code to compile on android.

R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/335903004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278657 0039d316-1c4b-4281-b951-d872f2087c98
parent e244e1ae
...@@ -199,7 +199,7 @@ class DestructionObserver : public NodeObserver, public ViewObserver { ...@@ -199,7 +199,7 @@ class DestructionObserver : public NodeObserver, public ViewObserver {
NodeObserver::DispositionChangePhase phase) OVERRIDE { NodeObserver::DispositionChangePhase phase) OVERRIDE {
if (phase != NodeObserver::DISPOSITION_CHANGED) if (phase != NodeObserver::DISPOSITION_CHANGED)
return; return;
std::set<Id>::const_iterator it = nodes_->find(node->id()); std::set<Id>::iterator it = nodes_->find(node->id());
if (it != nodes_->end()) if (it != nodes_->end())
nodes_->erase(it); nodes_->erase(it);
if (CanQuit()) if (CanQuit())
...@@ -212,7 +212,7 @@ class DestructionObserver : public NodeObserver, public ViewObserver { ...@@ -212,7 +212,7 @@ class DestructionObserver : public NodeObserver, public ViewObserver {
ViewObserver::DispositionChangePhase phase) OVERRIDE { ViewObserver::DispositionChangePhase phase) OVERRIDE {
if (phase != ViewObserver::DISPOSITION_CHANGED) if (phase != ViewObserver::DISPOSITION_CHANGED)
return; return;
std::set<Id>::const_iterator it = views_->find(view->id()); std::set<Id>::iterator it = views_->find(view->id());
if (it != views_->end()) if (it != views_->end())
views_->erase(it); views_->erase(it);
if (CanQuit()) if (CanQuit())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment