diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
| commit | 3ea1b18715919a522c6711e5ca5f2fd40e485850 (patch) | |
| tree | e17d17820edba1ce729fbe9948a23b498bfe1286 /chrome/plugin | |
| parent | 5ffc16b6a8ab99e5470cd23645fd3a12a04c6a0e (diff) | |
| download | chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.zip chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.gz chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.bz2 | |
Rename FilePath to base::FilePath and use new location of string_number_conversions in some chrome subdirectories.
Review URL: https://codereview.chromium.org/12218065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/chrome_content_plugin_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc index d92ff309..2060503 100644 --- a/chrome/plugin/chrome_content_plugin_client.cc +++ b/chrome/plugin/chrome_content_plugin_client.cc @@ -39,12 +39,12 @@ void ChromeContentPluginClient::PreSandboxInitialization() { #elif defined(OS_WIN) // crypt32.dll is used to decode X509 certificates for Chromoting. std::string error; - if (base::LoadNativeLibrary(FilePath(L"crypt32.dll"), &error) == NULL) + if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) LOG(ERROR) << "Failed to load crypto32.dll: " << error; #endif // defined(OS_WIN) // Load media libraries for the Chromoting client plugin. - FilePath media_path; + base::FilePath media_path; PathService::Get(content::DIR_MEDIA_LIBS, &media_path); if (!media_path.empty()) media::InitializeMediaLibrary(media_path); |