Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome_frame/in_place_menu.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 CHROME_FRAME_IN_PLACE_MENU_H_
 #define CHROME_FRAME_IN_PLACE_MENU_H_
 
 // in_place_menu.h : menu merging implementation
 //
 // This file is a modified version of the menu.h file, which is
 // part of the ActiveDoc MSDN sample. The modifications are largely
 // conversions to Google coding guidelines. Below is the original header
 // from the file.
 
 // This is a part of the Active Template Library.
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 //
 // This source code is only intended as a supplement to the
 // Active Template Library Reference and related
 // electronic documentation provided with the library.
 // See these sources for detailed information regarding the
 // Active Template Library product.
 
 #include "base/logging.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
 template <class T>
 class InPlaceMenu {
  public:
   InPlaceMenu() : shared_menu_(NULL), ole_menu_(NULL), our_menu_(NULL) {
   }
 
   ~InPlaceMenu() {
     InPlaceMenuDestroy();
   }
 
   HRESULT InPlaceMenuCreate(LPCWSTR menu_name) {
     // We might already have an in-place menu set, because we set menus
     // IOleDocumentView::UIActivate as well as in
     // IOleInPlaceActiveObject::OnDocWindowActivate. If we have already
     // done our work, just return silently
     if (ole_menu_ || shared_menu_)
       return S_OK;
 
-    ScopedComPtr<IOleInPlaceFrame> in_place_frame;
+    base::win::ScopedComPtr<IOleInPlaceFrame> in_place_frame;
     GetInPlaceFrame(in_place_frame.Receive());
     // We have no IOleInPlaceFrame, no menu merging possible
     if (!in_place_frame) {
       NOTREACHED();
       return E_FAIL;
     }
     // Create a blank menu and ask the container to add
     // its menus into the OLEMENUGROUPWIDTHS structure
     shared_menu_ = ::CreateMenu();
     OLEMENUGROUPWIDTHS mgw = {0};
     HRESULT hr = in_place_frame->InsertMenus(shared_menu_, &mgw);
     if (FAILED(hr)) {
       ::DestroyMenu(shared_menu_);
       shared_menu_ = NULL;
       return hr;
     }
     // Insert our menus
     our_menu_ = LoadMenu(_AtlBaseModule.GetResourceInstance(),menu_name);
     MergeMenus(shared_menu_, our_menu_, &mgw.width[0], 1);
     // Send the menu to the client
     ole_menu_ = (HMENU)OleCreateMenuDescriptor(shared_menu_, &mgw);
     T* t = static_cast<T*>(this);
     in_place_frame->SetMenu(shared_menu_, ole_menu_, t->m_hWnd);
     return S_OK;
   }
 
   HRESULT InPlaceMenuDestroy() {
-    ScopedComPtr<IOleInPlaceFrame> in_place_frame;
+    base::win::ScopedComPtr<IOleInPlaceFrame> in_place_frame;
     GetInPlaceFrame(in_place_frame.Receive());
     if (in_place_frame) {
       in_place_frame->RemoveMenus(shared_menu_);
       in_place_frame->SetMenu(NULL, NULL, NULL);
     }
     if (ole_menu_) {
       OleDestroyMenuDescriptor(ole_menu_);
       ole_menu_ = NULL;
     }
     if (shared_menu_) {
@@ skipping 86 matching lines @@
       NOTREACHED();
       return E_POINTER;
     }
     T* t = static_cast<T*>(this);
     HRESULT hr = E_FAIL;
     if (S_OK != t->GetInPlaceFrame(in_place_frame)) {
       // We weren't given an IOleInPlaceFrame pointer, so
       // we'll have to get it ourselves.
       if (t->m_spInPlaceSite) {
         t->frame_info_.cb = sizeof(OLEINPLACEFRAMEINFO);
-        ScopedComPtr<IOleInPlaceUIWindow> in_place_ui_window;
+        base::win::ScopedComPtr<IOleInPlaceUIWindow> in_place_ui_window;
         RECT position_rect = {0};
         RECT clip_rect = {0};
         hr = t->m_spInPlaceSite->GetWindowContext(in_place_frame,
                                                   in_place_ui_window.Receive(),
                                                   &position_rect, &clip_rect,
                                                   &t->frame_info_);
       }
     }
     return hr;
   }
 
  protected:
   // The OLE menu descriptor created by the OleCreateMenuDescriptor
   HMENU ole_menu_;
   // The shared menu that we pass to IOleInPlaceFrame::SetMenu
   HMENU shared_menu_;
   // Our menu resource that we want to insert
   HMENU our_menu_;
 };
 
 #endif  // CHROME_FRAME_IN_PLACE_MENU_H_