Use Scoped[Bstr,ComPtr,Variant] instead of their ATL equivalents to reduce de...

views/widget/widget_win.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
 #include "base/message_loop.h"
+#include "base/scoped_comptr_win.h"
 #include "base/system_monitor.h"
 #include "base/window_impl.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout_manager.h"
 #include "views/widget/widget.h"
 
 namespace gfx {
 class Canvas;
 class Rect;
 }
@@ skipping 555 matching lines @@
   // duplicate move events even though the mouse hasn't moved.
 
   // If true, the last event was a mouse move event.
   bool last_mouse_event_was_move_;
 
   // Coordinates of the last mouse move event, in screen coordinates.
   int last_mouse_move_x_;
   int last_mouse_move_y_;
 
   // Instance of accessibility information and handling for MSAA root
-  CComPtr<IAccessible> accessibility_root_;
+  ScopedComPtr<IAccessible> accessibility_root_;
 
   scoped_ptr<DefaultThemeProvider> default_theme_provider_;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_WIN_H_