Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: ash/system/palette/palette_tray.cc

Issue 2897553002: Do not activate TrayBubbleView by default (Closed)
Patch Set: Remove unnecessary code. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/palette/palette_tray.cc
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index 79c3677b2d9e6daeed47fc392623f78af7e0577e..c7da960ac4c17e251bf3cd51e389534e0df41df2 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -4,6 +4,8 @@
#include "ash/system/palette/palette_tray.h"
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/accessibility_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
@@ -155,7 +157,7 @@ PaletteTray::PaletteTray(Shelf* shelf)
PaletteTray::~PaletteTray() {
if (bubble_)
- bubble_->bubble_view()->reset_delegate();
+ bubble_->bubble_view()->ResetDelegate();
ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
Shell::Get()->RemoveShellObserver(this);
@@ -185,7 +187,6 @@ bool PaletteTray::ShowPalette() {
init_params.anchor_alignment = GetAnchorAlignment();
init_params.min_width = kPaletteWidth;
init_params.max_width = kPaletteWidth;
- init_params.can_activate = true;
init_params.close_on_deactivate = true;
// TODO(tdanderson): Refactor into common row layout code.
@@ -299,10 +300,26 @@ void PaletteTray::OnMouseEnteredView() {}
void PaletteTray::OnMouseExitedView() {}
+void PaletteTray::RegisterAccelerators(
+ const std::vector<ui::Accelerator>& accelerators,
+ views::TrayBubbleView* tray_bubble_view) {
+ Shell::Get()->accelerator_controller()->Register(accelerators,
+ tray_bubble_view);
+}
+
+void PaletteTray::UnregisterAllAccelerators(
+ views::TrayBubbleView* tray_bubble_view) {
+ Shell::Get()->accelerator_controller()->UnregisterAll(tray_bubble_view);
+}
+
base::string16 PaletteTray::GetAccessibleNameForBubble() {
return GetAccessibleNameForTray();
}
+bool PaletteTray::ShouldEnableExtraKeyboardAccessibility() {
+ return Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled();
+}
+
void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) {
HideBubbleWithView(bubble_view);
}

Powered by Google App Engine
This is Rietveld 408576698