Updated the VK Tray button to properly remove visual activated state.

ash/system/virtual_keyboard/virtual_keyboard_tray.cc

 // Copyright 2014 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/virtual_keyboard/virtual_keyboard_tray.h"
 
 #include <algorithm>
 
 #include "ash/keyboard/keyboard_ui.h"
 #include "ash/resources/vector_icons/vector_icons.h"
@@ skipping 21 matching lines @@
   gfx::ImageSkia image =
       gfx::CreateVectorIcon(kShelfKeyboardIcon, kShelfIconColor);
   icon_->SetImage(image);
   const int vertical_padding = (kTrayItemSize - image.height()) / 2;
   const int horizontal_padding = (kTrayItemSize - image.width()) / 2;
   icon_->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(vertical_padding, horizontal_padding)));
   tray_container()->AddChildView(icon_);
 
   // The Shell may not exist in some unit tests.
-  if (Shell::HasInstance())
+  if (Shell::HasInstance()) {
     Shell::Get()->keyboard_ui()->AddObserver(this);
+    Shell::Get()->AddShellObserver(this);
+  }
   // Try observing keyboard controller, in case it is already constructed.
   ObserveKeyboardController();
 }
 
 VirtualKeyboardTray::~VirtualKeyboardTray() {
   // Try unobserving keyboard controller, in case it still exists.
   UnobserveKeyboardController();
   // The Shell may not exist in some unit tests.
-  if (Shell::HasInstance())
+  if (Shell::HasInstance()) {
     Shell::Get()->keyboard_ui()->RemoveObserver(this);
+    Shell::Get()->RemoveShellObserver(this);

[James Cook, 2017/05/31 23:44:25]

super-nit: do this one line above so things are removed in the opposite order to
how they were added

[bruthig, 2017/06/01 14:05:15]

Done.

+  }
 }
 
 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME);
 }
 
 void VirtualKeyboardTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
 
@@ skipping 25 matching lines @@
   }
 }
 
 void VirtualKeyboardTray::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
   SetIsActive(!new_bounds.IsEmpty());
 }
 
 void VirtualKeyboardTray::OnKeyboardClosed() {}
 
+void VirtualKeyboardTray::OnKeyboardControllerCreated() {
+  ObserveKeyboardController();
+}
+
 void VirtualKeyboardTray::ObserveKeyboardController() {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
-  if (keyboard_controller)
+  if (keyboard_controller && !keyboard_controller->HasObserver(this))
     keyboard_controller->AddObserver(this);
 }
 
 void VirtualKeyboardTray::UnobserveKeyboardController() {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
 }
 
 }  // namespace ash