Removes --disable-ime-mode-indicator flag.

ash/system/ime/tray_ime.cc

 // 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.
 
 #include "ash/system/ime/tray_ime.h"
 
 #include <vector>
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
-#include "ash/system/system_notifier.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
-#include "ui/message_center/message_center.h"
-#include "ui/message_center/notification.h"
-#include "ui/message_center/notification_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
-using message_center::Notification;
-
-namespace {
-
-const char kIMENotificationId[] = "chrome://settings/ime";
-
-}  // namespace
-
 namespace ash {
 namespace internal {
 namespace tray {
 
 class IMEDefaultView : public TrayItemMore {
  public:
   explicit IMEDefaultView(SystemTrayItem* owner)
       : TrayItemMore(owner, true) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
@@ skipping 126 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
 
 TrayIME::TrayIME(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_label_(NULL),
       default_(NULL),
-      detailed_(NULL),
-      message_shown_(false),
-      weak_factory_(this) {
+      detailed_(NULL) {
   Shell::GetInstance()->system_tray_notifier()->AddIMEObserver(this);
 }
 
 TrayIME::~TrayIME() {
   Shell::GetInstance()->system_tray_notifier()->RemoveIMEObserver(this);
-  message_center::MessageCenter::Get()->RemoveNotification(
-      kIMENotificationId, false /* by_user */);
 }
 
 void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
   if (tray_label_) {
     bool visible = count > 1;
     tray_label_->SetVisible(visible);
     // Do not change label before hiding because this change is noticeable.
     if (!visible)
       return;
     if (current.third_party) {
       tray_label_->label()->SetText(
           current.short_name + base::UTF8ToUTF16("*"));
     } else {
       tray_label_->label()->SetText(current.short_name);
     }
     SetTrayLabelItemBorder(tray_label_, system_tray()->shelf_alignment());
     tray_label_->Layout();
   }
 }
 
-void TrayIME::UpdateOrCreateNotification() {
-  message_center::MessageCenter* message_center =
-      message_center::MessageCenter::Get();
-
-  if (!message_center->HasNotification(kIMENotificationId) && message_shown_)
-    return;
-
-  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
-  IMEInfo current;
-  delegate->GetCurrentIME(&current);
-
-  ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  scoped_ptr<Notification> notification(new Notification(
-      message_center::NOTIFICATION_TYPE_SIMPLE,
-      kIMENotificationId,
-      // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE
-      // for third party IMEs
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
-          current.medium_name),
-      base::string16(),  // message
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_IME),
-      base::string16(),  // display_source
-      message_center::NotifierId(
-          message_center::NotifierId::SYSTEM_COMPONENT,
-          system_notifier::kNotifierInputMethod),
-      message_center::RichNotificationData(),
-      new message_center::HandleNotificationClickedDelegate(
-          base::Bind(&TrayIME::PopupDetailedView,
-                     weak_factory_.GetWeakPtr(), 0, true))));
-  message_center->AddNotification(notification.Pass());
-  message_shown_ = true;
-}
-
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_label_ == NULL);
   tray_label_ = new TrayItemView(this);
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
   // Hide IME tray when it is created, it will be updated when it is notified
   // for IME refresh event.
   tray_label_->SetVisible(false);
   return tray_label_;
 }
@@ skipping 30 matching lines @@
 }
 
 void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayLabelItemBorder(tray_label_, alignment);
   tray_label_->Layout();
 }
 
-void TrayIME::OnIMERefresh(bool show_message) {
+void TrayIME::OnIMERefresh() {
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   IMEInfoList list;
   IMEInfo current;
   IMEPropertyInfoList property_list;
   delegate->GetCurrentIME(&current);
   delegate->GetAvailableIMEList(&list);
   delegate->GetCurrentIMEProperties(&property_list);
 
   UpdateTrayLabel(current, list.size());
 
   if (default_)
     default_->UpdateLabel(current);
   if (detailed_)
     detailed_->Update(list, property_list);
-
-  if (list.size() > 1 && show_message)
-    UpdateOrCreateNotification();
 }
 
 }  // namespace internal
 }  // namespace ash