diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 12:18:51 +0000 |
| commit | dcd5776135982012e99ea7b7030b3412f61235c7 (patch) | |
| tree | 2853a787d4c09e4a8417a0c74a312917a05dce08 /chrome/browser/importer/ie_importer.cc | |
| parent | 05ba8b8dd541632486513221795d45e4fe71b47f (diff) | |
| download | chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.zip chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.gz chromium_src-dcd5776135982012e99ea7b7030b3412f61235c7.tar.bz2 | |
Reland "Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories."
The issue with the r90464 was that in the win shared build we build dlls and we
need BASE_API to export functions and symbols.
BUG=72317
TEST=None
TBR=rsesek@chromium.org,brettw@chromium.org
Review URL: http://codereview.chromium.org/7263009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/ie_importer.cc')
| -rw-r--r-- | chrome/browser/importer/ie_importer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index cc1afd9..3577bb0 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -15,8 +15,6 @@ #include <string> #include <vector> -#include "app/win/scoped_co_mem.h" -#include "app/win/scoped_com_initializer.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/string_split.h" @@ -24,6 +22,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" +#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" @@ -31,8 +30,9 @@ #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url_service.h" +#include "chrome/common/scoped_co_mem.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -89,7 +89,7 @@ void IEImporter::StartImport(const importer::SourceProfile& source_profile, bridge_->NotifyStarted(); // Some IE settings (such as Protected Storage) are obtained via COM APIs. - app::win::ScopedCOMInitializer com_initializer; + base::win::ScopedCOMInitializer com_initializer; if ((items & importer::HOME_PAGE) && !cancelled()) ImportHomepage(); // Doesn't have a UI item. @@ -463,7 +463,7 @@ void IEImporter::ImportHomepage() { } std::wstring IEImporter::ResolveInternetShortcut(const std::wstring& file) { - app::win::ScopedCoMem<wchar_t> url; + chrome::common::ScopedCoMem<wchar_t> url; base::win::ScopedComPtr<IUniformResourceLocator> url_locator; HRESULT result = url_locator.CreateInstance(CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER); |