mash: make Env::last_mouse_location() accurate for Mus

ui/aura/env.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/env.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 105 matching lines @@
 
 void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool Env::IsMouseButtonDown() const {
   return input_state_lookup_.get() ? input_state_lookup_->IsMouseButtonDown() :
       mouse_button_flags_ != 0;
 }
 
+const gfx::Point& Env::last_mouse_location() const {
+  if (mode_ == Mode::LOCAL || always_use_last_mouse_location_ ||
+      !get_last_mouse_location_from_mus_) {
+    return last_mouse_location_;
+  }
+
+  // Some tests may not install a WindowTreeClient, and we allow multiple
+  // WindowTreeClients for the case of multiple connections.
+  if (window_tree_client_)
+    last_mouse_location_ = window_tree_client_->GetCursorScreenPoint();
+  return last_mouse_location_;
+}
+
 void Env::SetWindowTreeClient(WindowTreeClient* window_tree_client) {
   // The WindowTreeClient should only be set once. Test code may need to change
   // the value after the fact, to do that use EnvTestHelper.
   DCHECK(!window_tree_client_);
   window_tree_client_ = window_tree_client;
 }
 
 void Env::SetActiveFocusClient(client::FocusClient* focus_client,
                                Window* focus_client_root) {
   if (focus_client == active_focus_client_ &&
@@ skipping 12 matching lines @@
     observer.OnActiveFocusClientChanged(focus_client, focus_client_root);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 Env::Env(Mode mode)
     : mode_(mode),
       mouse_button_flags_(0),
       is_touch_down_(false),
+      get_last_mouse_location_from_mus_(mode_ == Mode::MUS),
       input_state_lookup_(InputStateLookup::Create()),
       context_factory_(nullptr),
       context_factory_private_(nullptr) {
   DCHECK(lazy_tls_ptr.Pointer()->Get() == NULL);
   lazy_tls_ptr.Pointer()->Set(this);
 }
 
 void Env::Init() {
   if (RunningInsideMus())
     return;
@@ skipping 40 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Env::GetChildIterator() const {
   return nullptr;
 }
 
 ui::EventTargeter* Env::GetEventTargeter() {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace aura