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

Unified Diff: ash/system/ime_menu/ime_menu_tray.cc

Issue 2897553002: Do not activate TrayBubbleView by default (Closed)
Patch Set: Add comment. 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/ime_menu/ime_menu_tray.cc
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
index b0c7fdea8e52ef061e87e982ecd75cce72a76363..b3c803c623917f79f5b1862beff147b593a2c5a9 100644
--- a/ash/system/ime_menu/ime_menu_tray.cc
+++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -4,6 +4,7 @@
#include "ash/system/ime_menu/ime_menu_tray.h"
+#include "ash/accelerators/accelerator_controller.h"
#include "ash/accessibility_delegate.h"
#include "ash/ash_constants.h"
#include "ash/root_window_controller.h"
@@ -297,7 +298,7 @@ ImeMenuTray::ImeMenuTray(Shelf* shelf)
ImeMenuTray::~ImeMenuTray() {
if (bubble_)
- bubble_->bubble_view()->reset_delegate();
+ bubble_->bubble_view()->ResetDelegate();
SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
tray_notifier->RemoveIMEObserver(this);
tray_notifier->RemoveVirtualKeyboardObserver(this);
@@ -469,10 +470,26 @@ void ImeMenuTray::OnMouseEnteredView() {}
void ImeMenuTray::OnMouseExitedView() {}
+void ImeMenuTray::RegisterAccelerators(
+ const std::vector<ui::Accelerator>& accelerators,
+ views::TrayBubbleView* tray_bubble_view) {
+ Shell::Get()->accelerator_controller()->Register(accelerators,
+ tray_bubble_view);
+}
+
+void ImeMenuTray::UnregisterAllAccelerators(
+ views::TrayBubbleView* tray_bubble_view) {
+ Shell::Get()->accelerator_controller()->UnregisterAll(tray_bubble_view);
+}
+
base::string16 ImeMenuTray::GetAccessibleNameForBubble() {
return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
}
+bool ImeMenuTray::ShouldEnableExtraKeyboardAccessibility() {
+ return Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled();
+}
+
void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) {
HideBubbleWithView(bubble_view);
}

Powered by Google App Engine
This is Rietveld 408576698