Merge 173933

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 "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 
 #if defined(USE_X11)
 #include "base/message_pump_aurax11.h"
 #endif
 
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
 Env::Env()
     : mouse_button_flags_(0),
-      is_cursor_hidden_(false),
       is_touch_down_(false),
       render_white_bg_(true),
       stacking_client_(NULL) {
 }
 
 Env::~Env() {
 #if defined(USE_X11)
   base::MessagePumpAuraX11::Current()->RemoveObserver(
       &device_list_updater_aurax11_);
 #endif
@@ skipping 17 matching lines @@
 }
 
 void Env::AddObserver(EnvObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void Env::SetLastMouseLocation(const Window& window,
-                               const gfx::Point& location_in_root) {
-  last_mouse_location_ = location_in_root;
-  client::ScreenPositionClient* client =
-      client::GetScreenPositionClient(window.GetRootWindow());
-  if (client)
-    client->ConvertPointToScreen(&window, &last_mouse_location_);
-}
-
-void Env::SetCursorShown(bool cursor_shown) {
-  if (cursor_shown) {
-    // Protect against restoring a position that hadn't been saved.
-    if (is_cursor_hidden_)
-      last_mouse_location_ = hidden_cursor_location_;
-    is_cursor_hidden_ = false;
-  } else {
-    hidden_cursor_location_ = last_mouse_location_;
-    last_mouse_location_ = gfx::Point(-10000, -10000);
-    is_cursor_hidden_ = true;
-  }
-}
-
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
 #if defined(USE_X11)
   return base::MessagePumpAuraX11::Current();
 #else
   return dispatcher_.get();
 #endif
 }
 #endif
 
@@ skipping 29 matching lines @@
 
 bool Env::CanAcceptEvent(const ui::Event& event) {
   return true;
 }
 
 ui::EventTarget* Env::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace aura