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

Unified Diff: webkit/plugins/npapi/plugin_list_mac.mm

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « webkit/plugins/npapi/plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_list_mac.mm
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
index 719301d0ece4be326a1a9120d390e67e7219d428..b818f89830187dabed1c89425f7797188420638a 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/plugins/npapi/plugin_list_mac.mm
@@ -19,7 +19,7 @@ namespace npapi {
namespace {
-void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs,
+void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs,
bool user) {
// Note that there are no NSSearchPathDirectory constants for these
// directories so we can't use Cocoa's NSSearchPathForDirectoriesInDomains().
@@ -32,7 +32,7 @@ void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs,
if (err)
return;
- plugin_dirs->push_back(FilePath(base::mac::PathFromFSRef(ref)));
+ plugin_dirs->push_back(base::FilePath(base::mac::PathFromFSRef(ref)));
}
// Returns true if the plugin should be prevented from loading.
@@ -68,7 +68,7 @@ bool IsBlacklistedPlugin(const WebPluginInfo& info) {
void PluginList::PlatformInit() {
}
-void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
+void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
// Load from the user's area
GetPluginCommonDirectory(plugin_dirs, true);
@@ -77,11 +77,11 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
}
void PluginList::GetPluginsInDir(
- const FilePath& path, std::vector<FilePath>* plugins) {
+ const base::FilePath& path, std::vector<base::FilePath>* plugins) {
file_util::FileEnumerator enumerator(path,
false, // not recursive
file_util::FileEnumerator::DIRECTORIES);
- for (FilePath path = enumerator.Next(); !path.value().empty();
+ for (base::FilePath path = enumerator.Next(); !path.value().empty();
path = enumerator.Next()) {
plugins->push_back(path);
}
« no previous file with comments | « webkit/plugins/npapi/plugin_list.cc ('k') | webkit/plugins/npapi/plugin_list_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698