summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-04 00:47:21 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-04 00:47:21 +0000
commitb11a51dd7ef6b95100b903841c2e742265b9ef4d (patch)
tree232bcafeeba611aaccabb485e4140b23b227f036 /base
parentd0977c01ffa5e733a828977a8aa30def295d700f (diff)
downloadchromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.zip
chromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.tar.gz
chromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.tar.bz2
base: Remove stub scoped_variant_win.h file.
Fix the callers and add base::win in the call sites. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/5507001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/scoped_variant_win.h9
-rw-r--r--base/win/scoped_variant.cc2
2 files changed, 1 insertions, 10 deletions
diff --git a/base/scoped_variant_win.h b/base/scoped_variant_win.h
deleted file mode 100644
index 3d6b650..0000000
--- a/base/scoped_variant_win.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2010 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.
-
-// TODO(brettw) remove this file when all callers are converted to using the
-// new location/namespace
-#include "base/win/scoped_variant.h"
-
-using base::win::ScopedVariant;
diff --git a/base/win/scoped_variant.cc b/base/win/scoped_variant.cc
index 278e976..40ccdf2 100644
--- a/base/win/scoped_variant.cc
+++ b/base/win/scoped_variant.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/scoped_variant_win.h"
+#include "base/win/scoped_variant.h"
#include "base/logging.h"
namespace base {