diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome/browser/shell_integration_win.cc | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 0b9c32e..72f9ad1 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -1,4 +1,4 @@ -// 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. @@ -13,11 +13,11 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" +#include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_constants.h" @@ -154,7 +154,7 @@ void MigrateChromiumShortcutsTask::MigrateWin7ShortcutsInPath( for (FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty(); shortcut = shortcuts_enum.Next()) { // Load the shortcut. - ScopedComPtr<IShellLink> shell_link; + base::win::ScopedComPtr<IShellLink> shell_link; if (FAILED(shell_link.CreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER))) { @@ -162,7 +162,7 @@ void MigrateChromiumShortcutsTask::MigrateWin7ShortcutsInPath( return; } - ScopedComPtr<IPersistFile> persist_file; + base::win::ScopedComPtr<IPersistFile> persist_file; if (FAILED(persist_file.QueryFrom(shell_link)) || FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) { NOTREACHED(); @@ -248,7 +248,7 @@ bool MigrateChromiumShortcutsTask::GetShortcutAppId( app_id->clear(); - ScopedComPtr<IPropertyStore> property_store; + base::win::ScopedComPtr<IPropertyStore> property_store; if (FAILED(property_store.QueryFrom(shell_link))) return false; |