Add ImeMenuTray element.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.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 "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"
 
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
+#include "ash/system/status_area_widget.h"
+#include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window_event_dispatcher.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/ime_menu/ime_menu_tray.h"
+#endif  // defined(OS_CHROMEOS)
+
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 
 namespace {
 
 std::string GetAppShelfId(AppWindow* app_window) {
   if (app_window->window_type_is_panel())
     return base::StringPrintf("panel:%d", app_window->session_id().id());
   return app_window->extension_id();
 }
@@ skipping 71 matching lines @@
   UnregisterApp(window);
 }
 
 void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {
   // Windows created by IME extension should be treated the same way as the
   // virtual keyboard window, which does not register itself in launcher.
   if (app_window->is_ime_window())
     return;
 
   aura::Window* window = app_window->GetNativeWindow();
+
+#if defined(OS_CHROMEOS)
+  // IME window created by IME extension should also not register itself in the
+  // lanucher. Instead, is should show ImeMenuTray in the status tray.
+  if (extension_misc::IsImeMenuExtensionId(app_window->extension_id())) {
+    ash::Shelf* shelf = ash::Shelf::ForWindow(app_window->GetNativeWindow());
+    if (shelf) {
+      ash::ImeMenuTray* ime_menu_tray =
+          shelf->shelf_widget()->status_area_widget()->ime_menu_tray();
+      if (ime_menu_tray) {
+        ime_menu_tray->SetImeWindow(window);
+        // Sets the property of the window to indicate that the icon should be
+        // shown on the status area tray.
+        window->SetProperty(ash::kShelfItemOnTrayForImeMenu, true);
+        ash::SetShelfIDForWindow(ash::kInvalidShelfID, window);
+      }
+    }
+    return;
+  }
+#endif  // defined(OS_CHROMEOS)
   // Get the app's shelf identifier and add an entry to the map.
   DCHECK(window_to_app_shelf_id_map_.find(window) ==
          window_to_app_shelf_id_map_.end());
   const std::string app_shelf_id = GetAppShelfId(app_window);
   window_to_app_shelf_id_map_[window] = app_shelf_id;
   window->AddObserver(this);
 
   // Find or create an item controller and launcher item.
   std::string app_id = app_window->extension_id();
   ash::ShelfItemStatus status = ash::wm::IsActiveWindow(window)
@@ skipping 34 matching lines @@
       owner()->SetItemController(shelf_id, controller);
     }
     const std::string app_shelf_id = GetAppShelfId(app_window);
     app_controller_map_[app_shelf_id] = controller;
   }
   owner()->SetItemStatus(shelf_id, status);
   ash::SetShelfIDForWindow(shelf_id, window);
 }
 
 void ExtensionAppWindowLauncherController::UnregisterApp(aura::Window* window) {
+  if (window->GetProperty(ash::kShelfItemOnTrayForImeMenu))
+    return;
+
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   DCHECK(iter1 != window_to_app_shelf_id_map_.end());
   std::string app_shelf_id = iter1->second;
   window_to_app_shelf_id_map_.erase(iter1);
   window->RemoveObserver(this);
 
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   DCHECK(iter2 != app_controller_map_.end());
   ExtensionAppWindowLauncherItemController* controller = iter2->second;
@@ skipping 21 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return nullptr;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return nullptr;
   return iter2->second;
 }