Lock screen for Chrome-Athena

athena/screen/screen_manager_impl.cc

Index: athena/screen/screen_manager_impl.cc
diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc
index 771f9397112c3a80cbe18f78dd84fb30f69c4c70..3ece1988ed8bf8cf220f19b8871dd4609f06ddab 100644
--- a/athena/screen/screen_manager_impl.cc
+++ b/athena/screen/screen_manager_impl.cc
@@ -154,6 +154,10 @@ class AthenaEventTargeter : public aura::WindowTargeter,
       container_->RemoveObserver(this);
   }
 
+  void SetPreviousEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {
+    previous_root_event_targeter_ = targeter.Pass();
+  }
+
  private:
   // aura::WindowTargeter:
   virtual bool SubtreeCanAcceptEvent(
@@ -183,10 +187,11 @@ class AthenaEventTargeter : public aura::WindowTargeter,
     container_ = NULL;
 
     // This will remove myself.
-    root_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
+    root_window->SetEventTargeter(previous_root_event_targeter_.Pass());
   }
 
   aura::Window* container_;
+  scoped_ptr<ui::EventTargeter> previous_root_event_targeter_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaEventTargeter);
 };
@@ -325,8 +330,11 @@ aura::Window* ScreenManagerImpl::CreateContainer(
     DCHECK(std::find_if(children.begin(), children.end(), &GrabsInput)
            == children.end())
         << "input has already been grabbed by another container";
-    root_window_->SetEventTargeter(
-        scoped_ptr<ui::EventTargeter>(new AthenaEventTargeter(container)));
+    AthenaEventTargeter* athena_event_targeter =

[oshima, 2014/10/13 18:52:20]

scoped_ptr< >

then pass it.

[Dmitry Polukhin, 2014/10/14 11:20:33]

I need plain pointer here because in next line I call
athena_event_targeter->SetPreviousEventTargeter passing athena_event_targeter as
scoped_ptr. Therefore depending on order of expression evaluation
athena_event_targeter may become NULL before SetPreviousEventTargeter will be
called. Or I'll have to make a copy in palin pointer before passing it as an
argument.

[oshima, 2014/10/14 19:05:15]

Acknowledged.

+        new AthenaEventTargeter(container);
+    athena_event_targeter->SetPreviousEventTargeter(
+        root_window_->SetEventTargeter(
+            scoped_ptr<ui::EventTargeter>(athena_event_targeter)));
   }
 
   root_window_->AddChild(container);