[Ash] Fold TrayNotificationView into AccessibilityPopupView

ash/common/system/tray_accessibility.h

Index: ash/common/system/tray_accessibility.h
diff --git a/ash/common/system/tray_accessibility.h b/ash/common/system/tray_accessibility.h
index 472ab0f944006c7895a6e73cd3aa4315bfe59b3d..40dfb497f48454c9b48115ed6b8056323f2972ad 100644
--- a/ash/common/system/tray_accessibility.h
+++ b/ash/common/system/tray_accessibility.h
@@ -12,10 +12,10 @@
 #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;
@@ -38,7 +38,12 @@ 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);
 
@@ -46,6 +51,7 @@ class AccessibilityPopupView : public TrayNotificationView {
 
  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_;