Add virtual keyboard item into opt-in IME menu.

ash/common/system/chromeos/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/common/system/chromeos/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 261 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ImeButtonsView);
 };
 
 }  // namespace
 
 ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       label_(new ImeMenuLabel()),
       show_keyboard_(false),
       force_show_keyboard_(false),
-      should_block_shelf_auto_hide_(false) {
+      should_block_shelf_auto_hide_(false),
+      keyboard_suppressed_(false) {
   SetupLabelForTray(label_);
   tray_container()->AddChildView(label_);
   SetContentsBackground();
   WmShell::Get()->system_tray_notifier()->AddIMEObserver(this);
 }
 
 ImeMenuTray::~ImeMenuTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
   WmShell::Get()->system_tray_notifier()->RemoveIMEObserver(this);
@@ skipping 21 matching lines @@
     views::Separator* separator =
         new views::Separator(views::Separator::HORIZONTAL);
     separator->SetColor(kBorderLightColor);
     separator->SetPreferredSize(kSeparatorWidth);
     separator->SetBorder(views::Border::CreateEmptyBorder(
         0, 0, kMenuSeparatorVerticalPadding, 0));
     bubble_view->AddChildView(separator);
   }
 
   // Adds IME list to the bubble.
-  ime_list_view_ =
-      new ImeListView(nullptr, false, ImeListView::SHOW_SINGLE_IME);
+  ime_list_view_ = new ImeListView(nullptr, ShouldShowKeyboardToggle(),
+                                   ImeListView::SHOW_SINGLE_IME);
 
   uint32_t current_height = ime_list_view_->scroll_content()->height();
   const gfx::Range height_range = GetImeListViewRange();
   if (current_height > height_range.end()) {
     ime_list_view_->scroller()->SetFixedSize(
         gfx::Size(kTrayPopupMaxWidth, height_range.end()));
   } else if (MaterialDesignController::IsSystemTrayMenuMaterial() &&
              current_height < height_range.start()) {
     ime_list_view_->scroller()->SetFixedSize(
         gfx::Size(kTrayPopupMaxWidth, height_range.start()));
@@ skipping 63 matching lines @@
   if (keyboard_controller) {
     keyboard_controller->AddObserver(this);
     keyboard_controller->ShowKeyboard(false);
   }
 }
 
 bool ImeMenuTray::ShouldBlockShelfAutoHide() const {
   return should_block_shelf_auto_hide_;
 }
 
+bool ImeMenuTray::ShouldShowKeyboardToggle() const {
+  return keyboard_suppressed_ &&

[tdanderson, 2016/11/03 21:17:20]

I left the following comment in
https://chromiumcodereview.appspot.com/2469663002/:

"I went into non-MD mode on canary, plugged in an external keyboard, and entered
touchview (maximize mode). When I go into the IME detailed view I see a "disable
on-screen keyboard" button, and when I tap it it turns into an "enable on-screen
keyboard" button. So the toggle row needs to be shown regardless of whether the
toggle state is on or off."

With that said, I don't think you are doing the right thing in this CL. To avoid
any confusion, let's iterate on and land
https://chromiumcodereview.appspot.com/2469663002/ first and then we can come
back to this CL.

[Azure Wei, 2016/11/20 08:56:23]

The method return true when the 'smart deploy toggle' should be shown:
If the user is in TouchView (virtual keyboard should be automatically deployed
if IsVirtualKeyboardEnabled() is false) and an external keyboard attached
(keyboard_suppressed_ is true). 
If the keyboard toggle is shown, turn on or off the toggle should not change the
returned value of this method.

+         !WmShell::Get()->accessibility_delegate()->IsVirtualKeyboardEnabled();
+}
+
 void ImeMenuTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   if (!MaterialDesignController::IsShelfMaterial())
     tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 ImeMenuTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
 
@@ skipping 108 matching lines @@
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
 
   if (!force_show_keyboard_)
     return;
 
   WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);
   force_show_keyboard_ = false;
 }
 
+void ImeMenuTray::OnKeyboardSuppressionChanged(bool suppressed) {
+  if (suppressed != keyboard_suppressed_ && bubble_)
+    HideImeMenuBubble();
+  keyboard_suppressed_ = suppressed;
+}
+
 void ImeMenuTray::UpdateTrayLabel() {
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash