CollectedCookiesViews: don't show info for unfocused cookies

chrome/browser/ui/views/collected_cookies_views.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/ui/views/collected_cookies_views.h"
 
 #include "base/macros.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
@@ skipping 479 matching lines @@
         CookieTreeNode::DetailedInfo::TYPE_HOST) {
       enable_blocked_buttons = static_cast<CookieTreeHostNode*>(
           cookie_node)->CanCreateContentException();
     }
   }
   allow_blocked_button_->SetEnabled(enable_blocked_buttons);
   for_session_blocked_button_->SetEnabled(enable_blocked_buttons);
 }
 
 void CollectedCookiesViews::ShowCookieInfo() {
-  ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode();
-  if (!node)
-    node = blocked_cookies_tree_->GetSelectedNode();
+  ui::TreeModelNode* node = allowed_cookies_tree_->HasFocus() ?

[sky, 2016/09/22 19:35:15]

How come you are checking focus and not visibilty? It seems like you should be
showing the cookies for the visible tree which is not necessarily the focused
tree.

[Elly Fong-Jones, 2016/09/23 12:38:08]

Hm. I originally did this because both trees had visible() == true, but I just
found IsDrawn(), which does the right thing, since the trees remain visible but
the TabbedPane container views are set visible/invisible as the active tab
changes. So, I changed this to IsDrawn().

+                            allowed_cookies_tree_->GetSelectedNode() : nullptr;
+  if (!node) {
+    node = blocked_cookies_tree_->HasFocus() ?
+           blocked_cookies_tree_->GetSelectedNode() : nullptr;
+  }
 
   if (node) {
     CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
     const CookieTreeNode::DetailedInfo detailed_info =
         cookie_node->GetDetailedInfo();
 
     if (detailed_info.node_type == CookieTreeNode::DetailedInfo::TYPE_COOKIE) {
       cookie_info_view_->SetCookie(detailed_info.cookie->Domain(),
                                    *detailed_info.cookie);
     } else {
@@ skipping 19 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, content::NotificationObserver implementation:
 
 void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
   GetWidget()->Close();
 }