[Ash] Fold TrayNotificationView into AccessibilityPopupView

ash/common/system/tray_accessibility.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_
 #define ASH_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/accessibility_observer.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_image_item.h"
-#include "ash/common/system/tray/tray_notification_view.h"
 #include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/view.h"
 
 namespace chromeos {
 class TrayAccessibilityTest;
 }
 
 namespace gfx {
 struct VectorIcon;
 }
 
 namespace views {
 class Button;
 class CustomButton;
 class Label;
 class View;
 }
 
 namespace ash {
 class HoverHighlightView;
 class SystemTrayItem;
 
 namespace tray {
 
-class AccessibilityPopupView : public TrayNotificationView {
+// A view for closable notification views, laid out like:
+//  -------------------
+// | icon  contents  x |
+//  ----------------v--
+// The close button will call OnClose() when clicked.
+class AccessibilityPopupView : public views::View {
  public:
   explicit AccessibilityPopupView(uint32_t enabled_state_bits);
 
   const views::Label* label_for_test() const { return label_; }
 
  private:
   views::Label* CreateLabel(uint32_t enabled_state_bits);
+  void InitView();

[Evan Stade, 2017/03/31 00:07:24]

nit: might as well just inline the implementation of InitView into the ctor. If
you want to follow the oft-ignored "don't do work in constructors" guidance then
you'd need to call this after the ctor, not in the ctor. (Also I'd call it
simply Init().)

[tdanderson, 2017/04/03 18:26:46]

Done.

 
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
 };
 
 // Create the detailed view of accessibility tray.
 class AccessibilityDetailedView : public TrayDetailsView,
                                   public ShellObserver {
  public:
@@ skipping 83 matching lines @@
   // A11y feature status on just entering the lock screen.
   bool show_a11y_menu_on_lock_screen_;
 
   friend class chromeos::TrayAccessibilityTest;
   DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_