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

views/controls/textfield/native_textfield_win.cc

 // Copyright (c) 2009 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 <algorithm>
+
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/clipboard.h"
 #include "base/gfx/native_theme.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
@@ skipping 72 matching lines @@
 
   RECT r = {0, 0, textfield_->width(), textfield_->height()};
   Create(textfield_->GetWidget()->GetNativeView(), r, NULL, style, ex_style);
 
   if (textfield_->style() & Textfield::STYLE_LOWERCASE) {
     DCHECK((textfield_->style() & Textfield::STYLE_PASSWORD) == 0);
     SetEditStyle(SES_LOWERCASE, SES_LOWERCASE);
   }
 
   // Set up the text_object_model_.
-  CComPtr<IRichEditOle> ole_interface;
+  ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
   ole_interface.Attach(GetOleInterface());
-  text_object_model_ = ole_interface;
+  text_object_model_.QueryFrom(ole_interface);
 }
 
 NativeTextfieldWin::~NativeTextfieldWin() {
   if (IsWindow())
     DestroyWindow();
 }
 
 void NativeTextfieldWin::AttachHack() {
   // See the code in textfield.cc that calls this for why this is here.
   container_view_->set_focus_view(textfield_);
@@ skipping 188 matching lines @@
   if (textfield_->read_only() || textfield_->IsPassword())
     return;
 
   OnCopy();
 
   // This replace selection will have no effect (even on the undo stack) if the
   // current selection is empty.
   ReplaceSel(L"", true);
 }
 
-LRESULT NativeTextfieldWin::OnImeChar(UINT message, WPARAM wparam, LPARAM lparam) {
+LRESULT NativeTextfieldWin::OnImeChar(UINT message,
+                                      WPARAM wparam,
+                                      LPARAM lparam) {
   // http://crbug.com/7707: a rich-edit control may crash when it receives a
   // WM_IME_CHAR message while it is processing a WM_IME_COMPOSITION message.
   // Since view controls don't need WM_IME_CHAR messages, we prevent WM_IME_CHAR
   // messages from being dispatched to view controls via the CallWindowProc()
   // call.
   return 0;
 }
 
 LRESULT NativeTextfieldWin::OnImeStartComposition(UINT message,
                                                   WPARAM wparam,
@@ skipping 186 matching lines @@
 void NativeTextfieldWin::OnMouseLeave() {
   SetContainsMouse(false);
 }
 
 LRESULT NativeTextfieldWin::OnMouseWheel(UINT message, WPARAM w_param,
                                          LPARAM l_param) {
   // Reroute the mouse-wheel to the window under the mouse pointer if
   // applicable.
   if (views::RerouteMouseWheel(m_hWnd, w_param, l_param))
     return 0;
-  return DefWindowProc(message, w_param, l_param);;
+  return DefWindowProc(message, w_param, l_param);
 }
 
 void NativeTextfieldWin::OnMouseMove(UINT keys, const CPoint& point) {
   SetContainsMouse(true);
   // Clamp the selection to the visible text so the user can't drag to select
   // the "phantom newline".  In theory we could achieve this by clipping the X
   // coordinate, but in practice the edit seems to behave nondeterministically
   // with similar sequences of clipped input coordinates fed to it.  Maybe it's
   // reading the mouse cursor position directly?
   //
@@ skipping 309 matching lines @@
     tme.dwFlags = TME_LEAVE;
     tme.hwndTrack = m_hWnd;
     tme.dwHoverTime = 0;
     TrackMouseEvent(&tme);
   }
   RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
 }
 
 ITextDocument* NativeTextfieldWin::GetTextObjectModel() const {
   if (!text_object_model_) {
-    CComPtr<IRichEditOle> ole_interface;
+    ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
     ole_interface.Attach(GetOleInterface());
-    text_object_model_ = ole_interface;
+    text_object_model_.QueryFrom(ole_interface);
   }
   return text_object_model_;
 }
 
 void NativeTextfieldWin::BuildContextMenu() {
   if (context_menu_contents_.get())
     return;
   context_menu_contents_.reset(new SimpleMenuModel(this));
   context_menu_contents_->AddItemWithStringId(IDS_APP_UNDO, IDS_APP_UNDO);
   context_menu_contents_->AddSeparator();
   context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
   context_menu_contents_->AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_->AddItemWithStringId(IDS_APP_PASTE, IDS_APP_PASTE);
   context_menu_contents_->AddSeparator();
   context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
                                               IDS_APP_SELECT_ALL);
   context_menu_.reset(new Menu2(context_menu_contents_.get()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views