Stop using an atom to store plugin name/version on Windows.

content/child/npapi/webplugin_delegate_impl_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 "content/child/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 481 matching lines @@
   // window correctly in the given parent window (RenderWidgetHostViewWin or
   // RenderWidgetHostViewAura), this window should be a child window of the
   // parent window. To satisfy both of the above conditions, this code once
   // creates a top-level window and change it to a child window of the parent
   // window (in the browser process).
     SetWindowLongPtr(windowed_handle_, GWL_STYLE,
                      WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
 
   BOOL result = SetProp(windowed_handle_, kWebPluginDelegateProperty, this);
   DCHECK(result == TRUE) << "SetProp failed, last error = " << GetLastError();
-  // Get the name and version of the plugin, create atoms and set them in a
-  // window property. Use atoms so that other processes can access the name and
-  // version of the plugin that this window is hosting.
-  if (instance_ != NULL) {
-    PluginLib* plugin_lib = instance()->plugin_lib();
-    if (plugin_lib != NULL) {
-      std::wstring plugin_name = plugin_lib->plugin_info().name;
-      if (!plugin_name.empty()) {
-        ATOM plugin_name_atom = GlobalAddAtomW(plugin_name.c_str());
-        DCHECK_NE(0, plugin_name_atom) << " last error = " <<
-            GetLastError();
-        result = SetProp(windowed_handle_,
-            kPluginNameAtomProperty,
-            reinterpret_cast<HANDLE>(plugin_name_atom));
-        DCHECK(result == TRUE) << "SetProp failed, last error = " <<
-            GetLastError();
-      }
-      base::string16 plugin_version = plugin_lib->plugin_info().version;
-      if (!plugin_version.empty()) {
-        ATOM plugin_version_atom = GlobalAddAtomW(plugin_version.c_str());
-        DCHECK_NE(0, plugin_version_atom);
-        result = SetProp(windowed_handle_,
-            kPluginVersionAtomProperty,
-            reinterpret_cast<HANDLE>(plugin_version_atom));
-        DCHECK(result == TRUE) << "SetProp failed, last error = " <<
-            GetLastError();
-      }
-    }
-  }
 
   // Calling SetWindowLongPtrA here makes the window proc ASCII, which is
   // required by at least the Shockwave Director plug-in.
   SetWindowLongPtrA(windowed_handle_,
                     GWLP_WNDPROC,
                     reinterpret_cast<LONG_PTR>(DefWindowProcA));
 
   return true;
 }
 
@@ skipping 479 matching lines @@
     // above. This will also destroy the plugin window. Before attempting to
     // access the WebPluginDelegateImpl instance we validate if the window is
     // still valid.
     if (::IsWindow(hwnd))
       delegate->is_calling_wndproc = false;
 
     g_current_plugin_instance = last_plugin_instance;
 
     if (message == WM_NCDESTROY) {
       RemoveProp(hwnd, kWebPluginDelegateProperty);
-      ATOM plugin_name_atom = reinterpret_cast<ATOM>(
-          RemoveProp(hwnd, kPluginNameAtomProperty));
-      if (plugin_name_atom != 0)
-        GlobalDeleteAtom(plugin_name_atom);
-      ATOM plugin_version_atom = reinterpret_cast<ATOM>(
-          RemoveProp(hwnd, kPluginVersionAtomProperty));
-      if (plugin_version_atom != 0)
-        GlobalDeleteAtom(plugin_version_atom);
       ClearThrottleQueueForWindow(hwnd);
     }
   }
   if (::IsWindow(hwnd))
     delegate->last_message_ = old_message;
   return result;
 }
 
 void WebPluginDelegateImpl::WindowlessUpdateGeometry(
     const gfx::Rect& window_rect,
@@ skipping 474 matching lines @@
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content