Ensure that mouse lock works correctly on Chrome ASH in Windows 8.

win8/metro_driver/chrome_app_view_ash.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 "win8/metro_driver/stdafx.h"
 #include "win8/metro_driver/chrome_app_view_ash.h"
 
 #include <corewindow.h>
 #include <shellapi.h>
 #include <windows.foundation.h>
@@ skipping 512 matching lines @@
   float win32_dpi_scale_;
 
   DISALLOW_COPY_AND_ASSIGN(PointerInfoHandler);
 };
 
 ChromeAppViewAsh::ChromeAppViewAsh()
     : mouse_down_flags_(ui::EF_NONE),
       ui_channel_(nullptr),
       core_window_hwnd_(NULL),
       metro_dpi_scale_(0),
-      win32_dpi_scale_(0) {
+      win32_dpi_scale_(0),
+      last_cursor_(NULL) {
   DVLOG(1) << __FUNCTION__;
   globals.previous_state =
       winapp::Activation::ApplicationExecutionState_NotRunning;
 }
 
 ChromeAppViewAsh::~ChromeAppViewAsh() {
   DVLOG(1) << __FUNCTION__;
 }
 
 IFACEMETHODIMP
@@ skipping 264 matching lines @@
   SHELLEXECUTEINFO sei = { sizeof(sei) };
   sei.fMask = SEE_MASK_FLAG_LOG_USAGE;
   sei.nShow = SW_SHOWNORMAL;
   sei.lpFile = file.c_str();
   sei.lpDirectory = L"";
   sei.lpParameters = url.c_str();
   BOOL result = ShellExecuteEx(&sei);
 }
 
 void ChromeAppViewAsh::OnSetCursor(HCURSOR cursor) {
-  ::SetCursor(HCURSOR(cursor));
+  ::SetCursor(cursor);
+  last_cursor_ = cursor;
 }
 
 void ChromeAppViewAsh::OnDisplayFileOpenDialog(
     const base::string16& title,
     const base::string16& filter,
     const base::FilePath& default_path,
     bool allow_multiple_files) {
   DVLOG(1) << __FUNCTION__;
 
   // The OpenFilePickerSession instance is deleted when we receive a
@@ skipping 246 matching lines @@
 }
 
 HRESULT ChromeAppViewAsh::OnPointerMoved(winui::Core::ICoreWindow* sender,
                                          winui::Core::IPointerEventArgs* args) {
   PointerInfoHandler pointer(metro_dpi_scale_, win32_dpi_scale_);
   HRESULT hr = pointer.Init(args);
   if (FAILED(hr))
     return hr;
 
   if (pointer.IsMouse()) {
+    // If the mouse was moved towards the charms or the OS specific section,
+    // the cursor may change from what the browser last set. Restore it here.
+    if (::GetCursor() != last_cursor_)
+      SetCursor(last_cursor_);
+
     GenerateMouseEventFromMoveIfNecessary(pointer);
     ui_channel_->Send(new MetroViewerHostMsg_MouseMoved(
         pointer.x(),
         pointer.y(),
         mouse_down_flags_ | GetKeyboardEventFlags()));
   } else {
     DCHECK(pointer.IsTouch());
     ui_channel_->Send(new MetroViewerHostMsg_TouchMoved(pointer.x(),
                                                         pointer.y(),
                                                         pointer.timestamp(),
@@ skipping 301 matching lines @@
   mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit;
   CheckHR(core_app.As(&app_exit));
   globals.app_exit = app_exit.Detach();
 }
 
 IFACEMETHODIMP
 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) {
   *view = mswr::Make<ChromeAppViewAsh>().Detach();
   return (*view) ? S_OK :  E_OUTOFMEMORY;
 }