Merge 279172 "Proper fix for accessibility in Windows 64 build."

ui/views/accessibility/native_view_accessibility_win.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/views/accessibility/native_view_accessibility_win.h"
 
 #include <oleacc.h>
 #include <UIAutomationClient.h>
 
 #include <set>
@@ skipping 12 matching lines @@
 #include "ui/base/win/atl_module.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/win/hwnd_util.h"
 
 namespace views {
 namespace {
 
-// A version of the OBJID_CLIENT constant that works in 64-bit mode too.
-static const LPARAM kObjIdClient = static_cast<ULONG>(OBJID_CLIENT);
-
 class AccessibleWebViewRegistry {
  public:
   static AccessibleWebViewRegistry* GetInstance();
 
   void RegisterWebView(View* web_view);
 
   void UnregisterWebView(View* web_view);
 
   // Given the view that received the request for the accessible
   // id in |top_view|, and the child id requested, return the native
@@ skipping 1452 matching lines @@
     if (view == NULL || view == view_) {
       alert_target_view_storage_ids_.erase(
           alert_target_view_storage_ids_.begin() + i);
     } else {
       ++i;
     }
   }
 }
 
 }  // namespace views