Add ImeMenuTray element.

ash/system/status_area_widget.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_
 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/login_status.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 class OverviewButtonTray;
 class ShellDelegate;
 class StatusAreaWidgetDelegate;
 class SystemTray;
 class WebNotificationTray;
 class WmShelf;
 class WmWindow;
 #if defined(OS_CHROMEOS)
 class LogoutButtonTray;
 class VirtualKeyboardTray;
+class ImeMenuTray;

[sadrul, 2016/06/27 15:08:05]

sort

[Azure Wei, 2016/06/27 18:33:49]

Done.

 #endif
 
 class ASH_EXPORT StatusAreaWidget : public views::Widget {
  public:
   StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf);
   ~StatusAreaWidget() override;
 
   // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
   void CreateTrayViews();
 
@@ skipping 19 matching lines @@
   WebNotificationTray* web_notification_tray() {
     return web_notification_tray_;
   }
   OverviewButtonTray* overview_button_tray() {
     return overview_button_tray_;
   }
   WmShelf* wm_shelf() { return wm_shelf_; }
 
   LoginStatus login_status() const { return login_status_; }
 
+#if defined(OS_CHROMEOS)
+  ImeMenuTray* ime_menu_tray() { return ime_menu_tray_; }
+#endif
+
   // Returns true if the shelf should be visible. This is used when the
   // shelf is configured to auto-hide and test if the shelf should force
   // the shelf to remain visible.
   bool ShouldShowShelf() const;
 
   // True if any message bubble is shown.
   bool IsMessageBubbleShown() const;
 
   // Notifies child trays, and the |status_area_widget_delegate_| to schedule a
   // paint.
   void SchedulePaint();
 
   // Overridden from views::Widget:
   void OnNativeWidgetActivationChanged(bool active) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
  private:
   void AddSystemTray();
   void AddWebNotificationTray();
 #if defined(OS_CHROMEOS)
   void AddLogoutButtonTray();
   void AddVirtualKeyboardTray();
+  void AddImeMenuTray();
 #endif
   void AddOverviewButtonTray();
 
   // Weak pointers to View classes that are parented to StatusAreaWidget:
   StatusAreaWidgetDelegate* status_area_widget_delegate_;
   OverviewButtonTray* overview_button_tray_;
   SystemTray* system_tray_;
   WebNotificationTray* web_notification_tray_;
 #if defined(OS_CHROMEOS)
   LogoutButtonTray* logout_button_tray_;
   VirtualKeyboardTray* virtual_keyboard_tray_;
+  ImeMenuTray* ime_menu_tray_;
 #endif
   LoginStatus login_status_;
 
   WmShelf* wm_shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_STATUS_AREA_WIDGET_H_