diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:46:59 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 21:46:59 +0000 |
| commit | 73680c5385d8e1354fd749d0d9b9a5562ec78e21 (patch) | |
| tree | eec41c9c66ffbf88471e869c7271782bc5a09968 /chrome/browser/chromeos/extensions/file_handler_util.cc | |
| parent | 4ba7af4ea34ea2192b63db18009a9725e1af8b8e (diff) | |
| download | chromium_src-73680c5385d8e1354fd749d0d9b9a5562ec78e21.zip chromium_src-73680c5385d8e1354fd749d0d9b9a5562ec78e21.tar.gz chromium_src-73680c5385d8e1354fd749d0d9b9a5562ec78e21.tar.bz2 | |
Move the fileBrowserPrivate API out of extensions entirely.
BUG=159265
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11572058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/extensions/file_handler_util.cc')
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_handler_util.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc index 9e94e65..386d896 100644 --- a/chrome/browser/chromeos/extensions/file_handler_util.cc +++ b/chrome/browser/chromeos/extensions/file_handler_util.cc @@ -13,6 +13,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" #include "chrome/browser/chromeos/drive/drive_task_executor.h" +#include "chrome/browser/chromeos/extensions/file_browser_handler.h" #include "chrome/browser/chromeos/extensions/file_manager_util.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_host.h" @@ -28,7 +29,6 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" @@ -121,9 +121,11 @@ bool MatchesAllURLs(const FileBrowserHandler* handler) { const FileBrowserHandler* FindFileBrowserHandler(const Extension* extension, const std::string& action_id) { - for (Extension::FileBrowserHandlerList::const_iterator action_iter = - extension->file_browser_handlers()->begin(); - action_iter != extension->file_browser_handlers()->end(); + FileBrowserHandler::List* handler_list = + FileBrowserHandler::GetHandlers(extension); + for (FileBrowserHandler::List::const_iterator action_iter = + handler_list->begin(); + action_iter != handler_list->end(); ++action_iter) { if (action_iter->get()->id() == action_id) return action_iter->get(); @@ -174,12 +176,14 @@ bool GetFileBrowserHandlers(Profile* profile, if (profile->IsOffTheRecord() && !service->IsIncognitoEnabled(extension->id())) continue; - if (!extension->file_browser_handlers()) - continue; - for (Extension::FileBrowserHandlerList::const_iterator action_iter = - extension->file_browser_handlers()->begin(); - action_iter != extension->file_browser_handlers()->end(); + FileBrowserHandler::List* handler_list = + FileBrowserHandler::GetHandlers(extension); + if (!handler_list) + continue; + for (FileBrowserHandler::List::const_iterator action_iter = + handler_list->begin(); + action_iter != handler_list->end(); ++action_iter) { const FileBrowserHandler* action = action_iter->get(); if (!action->MatchesURL(lowercase_url)) |