Discarded property on chrome.tabs.Tab and chrome.tabs.query()

chrome/browser/extensions/api/tabs/tabs_api.cc

 // Copyright (c) 2012 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/extensions/api/tabs/tabs_api.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/windows_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
+#include "chrome/browser/memory/tab_manager.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 912 matching lines @@
 
     if (!window_type.empty() &&
         window_type !=
             browser->extension_window_controller()->GetWindowTypeText()) {
       continue;
     }
 
     TabStripModel* tab_strip = browser->tab_strip_model();
     for (int i = 0; i < tab_strip->count(); ++i) {
       WebContents* web_contents = tab_strip->GetWebContentsAt(i);
+      memory::TabManager* tab_manager = g_browser_process->GetTabManager();
 
       if (index > -1 && i != index)
         continue;
 
       if (!MatchesBool(params->query_info.highlighted.get(),
                        tab_strip->IsTabSelected(i))) {
         continue;
       }
 
       if (!MatchesBool(params->query_info.active.get(),
                        i == tab_strip->active_index())) {
         continue;
       }
 
       if (!MatchesBool(params->query_info.pinned.get(),
                        tab_strip->IsTabPinned(i))) {
         continue;
       }
 
       if (!MatchesBool(params->query_info.audible.get(),
                        web_contents->WasRecentlyAudible())) {
         continue;
       }
 
+      // If tab_manager is not present, no tabs are discarded and therefore
+      // the tab is returned only if query_info.discarded is false. Otherwise
+      // check the matching of the parameter and the status on tab_manager.
+      bool discarded = false;
+      if (tab_manager)

[Georges Khalil, 2016/06/16 20:22:13]

nit: bool discarded = tab_manager && tab_manager->IsTabDiscarded(web_contents);
(Same as next file below)

[Anderson Silva, 2016/06/16 21:53:08]

Done.
It's less intuitive thought in this case, that's why I did the way I did in the
first place. But I think with the comment explaining it should be fine.

+        discarded = tab_manager->IsTabDiscarded(web_contents);
+      if (!MatchesBool(params->query_info.discarded.get(), discarded))
+        continue;
+
       if (!MatchesBool(params->query_info.muted.get(),
                        web_contents->IsAudioMuted())) {
         continue;
       }
 
       if (!title.empty() || !url_patterns.is_empty()) {
         // "title" and "url" properties are considered privileged data and can
         // only be checked if the extension has the "tabs" permission or it has
         // access to the WebContents's origin. Otherwise, this tab is considered
         // not matched.
@@ skipping 1154 matching lines @@
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
   zoom_settings.default_zoom_factor.reset(new double(
       content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));
 
   results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions