diff options
author | haruki@chromium.org <haruki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 13:31:18 +0000 |
---|---|---|
committer | haruki@chromium.org <haruki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 13:31:18 +0000 |
commit | 05404e5be0b3a89d71550a165c60a3d5493e1dfe (patch) | |
tree | 4ebec73b07f9a43f0c94c674fdc73d350c0bd45d | |
parent | 6bb7a5796013e71fe4a23372fdf359e1272edbc2 (diff) | |
download | chromium_src-05404e5be0b3a89d71550a165c60a3d5493e1dfe.zip chromium_src-05404e5be0b3a89d71550a165c60a3d5493e1dfe.tar.gz chromium_src-05404e5be0b3a89d71550a165c60a3d5493e1dfe.tar.bz2 |
filemanager: Remove garbage values and params for SharedWithMe server-side search.
BUG=
TEST=unittests, Open Files App and verify a search for Drive works.
Review URL: https://chromiumcodereview.appspot.com/14076007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194912 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/resources/file_manager/js/directory_contents.js | 18 | ||||
-rw-r--r-- | chrome/browser/resources/file_manager/js/directory_model.js | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/chrome/browser/resources/file_manager/js/directory_contents.js b/chrome/browser/resources/file_manager/js/directory_contents.js index 700f2ef..7d17ce4 100644 --- a/chrome/browser/resources/file_manager/js/directory_contents.js +++ b/chrome/browser/resources/file_manager/js/directory_contents.js @@ -435,17 +435,6 @@ DirectoryContentsBasic.prototype.createDirectory = function( }; /** - * List of search types for DirectoryContentsDriveSearch. - * SEARCH_FULL uses the full feed to search from everything. - * SEARCH_SHARED_WITH_ME uses the shared-with-me feed. - * @enum {number} - */ -DirectoryContentsDriveSearch.SearchType = { - SEARCH_FULL: 0, - SEARCH_SHARED_WITH_ME: 1 -}; - -/** * Delay to be used for drive search scan. * The goal is to reduce the number of server requests when user is typing the * query. @@ -469,20 +458,17 @@ DirectoryContentsDriveSearch.MAX_RESULTS = 100; * @param {DirectoryEntry} previousDirEntry DirectoryEntry that was current * before the search. * @param {string} query Search query. - * @param {DirectoryContentsDriveSearch.SearchType} type Type of search. * @constructor * @extends {DirectoryContents} */ function DirectoryContentsDriveSearch(context, dirEntry, previousDirEntry, - query, - type) { + query) { DirectoryContents.call(this, context); - this.query_ = query; - this.type_ = type; this.directoryEntry_ = dirEntry; this.previousDirectoryEntry_ = previousDirEntry; + this.query_ = query; this.nextFeed_ = ''; this.done_ = false; this.fetchedResultsNum_ = 0; diff --git a/chrome/browser/resources/file_manager/js/directory_model.js b/chrome/browser/resources/file_manager/js/directory_model.js index b06c0bfb..36689d6 100644 --- a/chrome/browser/resources/file_manager/js/directory_model.js +++ b/chrome/browser/resources/file_manager/js/directory_model.js @@ -1321,8 +1321,7 @@ DirectoryModel.prototype.search = function(query, this.currentFileListContext_, this.getCurrentDirEntry(), this.currentDirContents_.getLastNonSearchDirectoryEntry(), - query, - DirectoryContentsDriveSearch.SearchType.SEARCH_FULL); + query); } else { newDirContents = new DirectoryContentsLocalSearch( this.currentFileListContext_, this.getCurrentDirEntry(), query); |