[Ash] Fold TrayNotificationView into AccessibilityPopupView

ash/common/system/tray_accessibility.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 "ash/common/system/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm_shell.h"
-#include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/resources/grit/ui_resources.h"
+#include "ui/views/background.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 enum AccessibilityState {
   A11Y_NONE = 0,
   A11Y_SPOKEN_FEEDBACK = 1 << 0,
   A11Y_HIGH_CONTRAST = 1 << 1,
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
@@ skipping 81 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::tray::AccessibilityPopupView
 
 AccessibilityPopupView::AccessibilityPopupView(uint32_t enabled_state_bits)
-    : TrayNotificationView(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK),
-      label_(CreateLabel(enabled_state_bits)) {
-  InitView(label_);
+    : label_(CreateLabel(enabled_state_bits)) {}
+
+void AccessibilityPopupView::Init() {
+  set_background(views::Background::CreateSolidBackground(kBackgroundColor));
+
+  views::GridLayout* layout = new views::GridLayout(this);
+  SetLayoutManager(layout);
+
+  views::ImageView* close_button = new views::ImageView();
+  close_button->SetImage(
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));
+  close_button->SetHorizontalAlignment(views::ImageView::CENTER);
+  close_button->SetVerticalAlignment(views::ImageView::CENTER);
+
+  views::ImageView* icon = new views::ImageView;
+  icon->SetImage(
+      gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon, kMenuIconColor));
+
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+
+  columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
+
+  // Icon
+  columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
+                     0, /* resize percent */
+                     views::GridLayout::FIXED, kNotificationIconWidth,
+                     kNotificationIconWidth);
+
+  columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
+
+  // Contents
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
+                     100, /* resize percent */
+                     views::GridLayout::FIXED, kTrayNotificationContentsWidth,
+                     kTrayNotificationContentsWidth);
+
+  columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
+
+  // Close button
+  columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
+                     0, /* resize percent */
+                     views::GridLayout::FIXED, kNotificationButtonWidth,
+                     kNotificationButtonWidth);
+
+  // Layout rows
+  layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
+  layout->StartRow(0, 0);
+  layout->AddView(icon);
+  layout->AddView(label_);
+  layout->AddView(close_button);
+  layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
 }
 
 views::Label* AccessibilityPopupView::CreateLabel(uint32_t enabled_state_bits) {
   DCHECK((enabled_state_bits &
           (A11Y_SPOKEN_FEEDBACK | A11Y_BRAILLE_DISPLAY_CONNECTED)) != 0);
   base::string16 text;
   if (enabled_state_bits & A11Y_BRAILLE_DISPLAY_CONNECTED) {
     text.append(l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_BRAILLE_DISPLAY_CONNECTED_BUBBLE));
   }
@@ skipping 304 matching lines @@
   return default_;
 }
 
 views::View* TrayAccessibility::CreateDetailedView(LoginStatus status) {
   CHECK(detailed_popup_ == NULL);
   CHECK(detailed_menu_ == NULL);
 
   if (request_popup_view_state_) {
     detailed_popup_ =
         new tray::AccessibilityPopupView(request_popup_view_state_);
+    detailed_popup_->Init();
     request_popup_view_state_ = A11Y_NONE;
     return detailed_popup_;
   } else {
     WmShell::Get()->RecordUserMetricsAction(
         ash::UMA_STATUS_AREA_DETAILED_ACCESSABILITY);
     detailed_menu_ = CreateDetailedMenu();
     return detailed_menu_;
   }
 }
 
@@ skipping 40 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash