Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2548)

Unified Diff: chrome/browser/platform_util_win.cc

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert bad indentation, rebase Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/platform_util_win.cc
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index bd1cf9ceed039906b7decf4764f43075bc6cd085..94d82ebb97e02ff96007a521ee5e2e91ea930afb 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -13,14 +13,14 @@
#include "app/win/shell.h"
#include "base/file_path.h"
#include "base/file_util.h"
-#include "base/path_service.h"
#include "base/logging.h"
-#include "base/scoped_comptr_win.h"
+#include "base/path_service.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/win/registry.h"
-#include "chrome/installer/util/google_update_settings.h"
+#include "base/win/scoped_comptr.h"
#include "chrome/installer/util/google_update_constants.h"
+#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/install_util.h"
#include "googleurl/src/gurl.h"
#include "ui/base/message_box_win.h"
@@ -64,7 +64,7 @@ void ShowItemInFolder(const FilePath& full_path) {
return;
}
- ScopedComPtr<IShellFolder> desktop;
+ base::win::ScopedComPtr<IShellFolder> desktop;
HRESULT hr = SHGetDesktopFolder(desktop.Receive());
if (FAILED(hr))
return;
« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698