diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 07:31:34 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 07:31:34 +0000 |
| commit | 5e5cf78fac22d1bc513cb6bb57dc4e3e3244a77e (patch) | |
| tree | ff057d0e9e3527872d2b7e2892e8c3860a72244e /chrome/browser/chromeos/file_manager/file_browser_handlers.cc | |
| parent | 3315b21fb3822aa9ad30ca23d220865bfe4cdafa (diff) | |
| download | chromium_src-5e5cf78fac22d1bc513cb6bb57dc4e3e3244a77e.zip chromium_src-5e5cf78fac22d1bc513cb6bb57dc4e3e3244a77e.tar.gz chromium_src-5e5cf78fac22d1bc513cb6bb57dc4e3e3244a77e.tar.bz2 | |
A few cleaning up in file manager C++ code.
* Remove obsolete TODO comments that are associated with closed bugs.
* Use improved macros.
* Remove unused headers.
* Fix typo.
BUG=none
Review URL: https://codereview.chromium.org/331563002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/file_manager/file_browser_handlers.cc')
| -rw-r--r-- | chrome/browser/chromeos/file_manager/file_browser_handlers.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc index 3159231..1222e10 100644 --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc @@ -200,7 +200,7 @@ FileBrowserHandlerExecutor::SetupFileAccessPermissions( scoped_refptr<fileapi::FileSystemContext> file_system_context_handler, const scoped_refptr<const Extension>& handler_extension, const std::vector<FileSystemURL>& file_urls) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK_CURRENTLY_ON(BrowserThread::FILE); DCHECK(handler_extension.get()); fileapi::ExternalFileSystemBackend* backend = @@ -298,7 +298,7 @@ void FileBrowserHandlerExecutor::ExecuteAfterSetupFileAccess( } void FileBrowserHandlerExecutor::ExecuteDoneOnUIThread(bool success) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!done_.is_null()) done_.Run( success @@ -310,7 +310,7 @@ void FileBrowserHandlerExecutor::ExecuteDoneOnUIThread(bool success) { void FileBrowserHandlerExecutor::ExecuteFileActionsOnUIThread( scoped_ptr<FileDefinitionList> file_definition_list, scoped_ptr<EntryDefinitionList> entry_definition_list) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK_CURRENTLY_ON(BrowserThread::UI); if (file_definition_list->empty() || entry_definition_list->empty()) { ExecuteDoneOnUIThread(false); @@ -471,11 +471,8 @@ bool ExecuteFileBrowserHandler( // files to be directly opened with the browser. if (ShouldBeOpenedWithBrowser(extension->id(), action_id)) { const bool result = OpenFilesWithBrowser(profile, file_urls); - if (!done.is_null()) { - done.Run(result - ? extensions::api::file_browser_private::TASK_RESULT_OPENED - : extensions::api::file_browser_private::TASK_RESULT_FAILED); - } + if (result && !done.is_null()) + done.Run(extensions::api::file_browser_private::TASK_RESULT_OPENED); return result; } |