Prepare SystemTray to support notifications

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/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class IMEDefaultView : public TrayItemMore {
  public:
   explicit IMEDefaultView(SystemTrayItem* owner)
       : TrayItemMore(owner) {
@@ skipping 138 matching lines @@
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, std::string> property_map_;
   views::View* header_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
 
-TrayIME::TrayIME() {
+TrayIME::TrayIME()
+    : tray_label_(NULL),
+      default_(NULL),
+      detailed_(NULL) {
 }
 
 TrayIME::~TrayIME() {
 }
 
 void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
-  tray_label_->label()->SetText(current.short_name);
-  tray_label_->SetVisible(count > 1);
+  if (tray_label_) {
+    tray_label_->label()->SetText(current.short_name);
+    tray_label_->SetVisible(count > 1);
+  }
 }
 
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
-  tray_label_.reset(new TrayItemView);
+  DCHECK(tray_label_ == NULL);
+  tray_label_ = new TrayItemView;
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
   tray_label_->set_border(
       views::Border::CreateEmptyBorder(0, 2, 0, 2));
-  return tray_label_.get();
+  return tray_label_;
 }
 
 views::View* TrayIME::CreateDefaultView(user::LoginStatus status) {
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   IMEInfoList list;
   IMEPropertyInfoList property_list;
   delegate->GetAvailableIMEList(&list);
   delegate->GetCurrentIMEProperties(&property_list);
   if (list.size() <= 1 && property_list.size() <= 1)
     return NULL;
-  default_.reset(new tray::IMEDefaultView(this));
-  return default_.get();
+  DCHECK(detailed_ == NULL);
+  default_ = new tray::IMEDefaultView(this);
+  return default_;
 }
 
 views::View* TrayIME::CreateDetailedView(user::LoginStatus status) {
-  detailed_.reset(new tray::IMEDetailedView(this, status));
-  return detailed_.get();
+  DCHECK(detailed_ == NULL);
+  detailed_ = new tray::IMEDetailedView(this, status);
+  return detailed_;
 }
 
 void TrayIME::DestroyTrayView() {
-  tray_label_.reset();
+  tray_label_ = NULL;
 }
 
 void TrayIME::DestroyDefaultView() {
-  default_.reset();
+  default_ = NULL;
 }
 
 void TrayIME::DestroyDetailedView() {
-  detailed_.reset();
+  detailed_ = NULL;
 }
 
 void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayIME::OnIMERefresh() {
   SystemTrayDelegate* delegate = Shell::GetInstance()->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_.get())
+  if (default_)
     default_->UpdateLabel(current);
-  if (detailed_.get())
+  if (detailed_)
     detailed_->Update(list, property_list);
 }
 
 }  // namespace internal
 }  // namespace ash