Reland with a fix: Do not activate TrayBubbleView by default

ash/system/ime_menu/ime_menu_tray.cc

 // Copyright 2016 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/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/ime/ime_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/ime_menu/ime_list_view.h"
@@ skipping 274 matching lines @@
   SetupLabelForTray(label_);
   label_->SetElideBehavior(gfx::TRUNCATE);
   tray_container()->AddChildView(label_);
   SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
   tray_notifier->AddIMEObserver(this);
   tray_notifier->AddVirtualKeyboardObserver(this);
 }
 
 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);
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
 }
 
 void ImeMenuTray::ShowImeMenuBubble() {
@@ skipping 10 matching lines @@
 }
 
 void ImeMenuTray::ShowImeMenuBubbleInternal() {
   views::TrayBubbleView::InitParams init_params;
   init_params.delegate = this;
   init_params.parent_window = GetBubbleWindowContainer();
   init_params.anchor_view = GetBubbleAnchor();
   init_params.anchor_alignment = GetAnchorAlignment();
   init_params.min_width = kTrayMenuMinimumWidth;
   init_params.max_width = kTrayMenuMinimumWidth;
-  init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   views::TrayBubbleView* bubble_view = new views::TrayBubbleView(init_params);
   bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets());
 
   // Add a title item with a separator on the top of the IME menu.
   bubble_view->AddChildView(
       new ImeTitleView(!ShouldShowEmojiHandwritingVoiceButtons()));
 
   // Adds IME list to the bubble.
@@ skipping 117 matching lines @@
     HideImeMenuBubble();
 }
 
 void ImeMenuTray::BubbleViewDestroyed() {
 }
 
 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);
 }
 
 void ImeMenuTray::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {}
 
 void ImeMenuTray::OnKeyboardClosed() {
   if (InputMethodManager::Get())
     InputMethodManager::Get()->OverrideKeyboardUrlRef(std::string());
   keyboard::KeyboardController* keyboard_controller =
@@ skipping 57 matching lines @@
   else
     label_->SetText(current_ime.short_name);
 }
 
 void ImeMenuTray::DisableVirtualKeyboard() {
   Shell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);
   force_show_keyboard_ = false;
 }
 
 }  // namespace ash