Make close button visible when focusing inline actions.

ui/message_center/views/notification_view.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 "ui/message_center/views/notification_view.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 690 matching lines @@
         IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_TOOLTIP));
     close_button_->set_owned_by_client();
     AddChildView(close_button_.get());
     UpdateControlButtonsVisibility();
   } else if (notification.pinned() && close_button_) {
     close_button_.reset();
   }
 }
 
 void NotificationView::UpdateControlButtonsVisibility() {
-  const bool target_visibility =
-      IsMouseHovered() || HasFocus() ||
-      (close_button_ && close_button_->HasFocus()) ||
-      (settings_button_view_ && settings_button_view_->HasFocus());
+  const bool target_visibility = IsMouseHovered() || HasFocusedView();
 
   if (close_button_) {
     if (target_visibility != close_button_->visible())
       close_button_->SetVisible(target_visibility);
   }
 
   if (settings_button_view_) {
     if (target_visibility != settings_button_view_->visible())
       settings_button_view_->SetVisible(target_visibility);
   }
@@ skipping 33 matching lines @@
       std::max(0, message_line_limit - line_reduction_from_title);
 
   return message_line_limit;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) const {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
+bool NotificationView::HasFocusedView() {
+  const views::FocusManager* focus_manager = GetFocusManager();
+  return focus_manager && Contains(focus_manager->GetFocusedView());
+}
+
 }  // namespace message_center