drive: Add drive/trash

chrome/browser/chromeos/drive/search_metadata.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 
 #include <algorithm>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 100 matching lines @@
     return entry.shared_with_me();
 
   if (options & SEARCH_METADATA_OFFLINE) {
     if (entry.file_specific_info().is_hosted_document())
       return true;
     FileCacheEntry cache_entry;
     it->GetCacheEntry(&cache_entry);
     return cache_entry.is_present();
   }
 
-  // Exclude "drive", "drive/root", and "drive/other".
+  // Exclude "drive", "drive/root", "drive/other", "drive/trash" and its
+  // children.
   if (it->GetID() == util::kDriveGrandRootLocalId ||
-      entry.parent_local_id() == util::kDriveGrandRootLocalId) {
+      entry.parent_local_id() == util::kDriveGrandRootLocalId ||
+      entry.parent_local_id() == util::kDriveTrashDirLocalId) {

[kinaba, 2013/11/12 02:10:27]

Is looking only the parent sufficient (i.e., what happens if the user removed a
directory?)

[hashimoto, 2013/11/12 04:08:13]

Hmm, recursively looking up parent does not look efficient.
Maybe we should use a boolean flag for deleted entries instead of drive/trash...

     return false;
   }
 
   return true;
 }
 
 // Used to implement SearchMetadata.
 // Adds entry to the result when appropriate.
 // In particular, if |query| is non-null, only adds files with the name matching
 // the query.
@@ skipping 137 matching lines @@
   highlighted_text->append(net::EscapeForHTML(base::UTF16ToUTF8(pre)));
   highlighted_text->append("<b>");
   highlighted_text->append(net::EscapeForHTML(base::UTF16ToUTF8(match)));
   highlighted_text->append("</b>");
   highlighted_text->append(net::EscapeForHTML(base::UTF16ToUTF8(post)));
   return true;
 }
 
 }  // namespace internal
 }  // namespace drive