Stop using shell::GetInstance()->system_tray() in system tray items

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/shell.h"
+#include "ash/system/tray/system_tray.h"

[msw, 2012/11/16 20:09:04]

nit: potentially not necessary; tray_user.h include system_tray_item.h

[bartfab (slow), 2012/11/19 17:15:31]

system_tray_item.h has a forward declaration of the SystemTray class only. This
file needs the actual definition.

[oshima, 2012/11/19 17:43:43]

looks like it's not used in a way need definition?

[bartfab (slow), 2012/11/19 18:00:31]

Actually, you are right. I can remove the include - it is a somewhat moot
exercise though as my next CL will add it straight back because it will be using
the system tray object.

On 2012/11/19 17:43:43, oshima wrote:

[oshima, 2012/11/19 21:14:17]

If this will be necessary in next CL, please add it in that CL.
This way, we can keep the code in clean state.

[bartfab (slow), 2012/11/19 22:32:25]

Yes, of course. I addressed your comment and removed the include. I just
mentioned that it will be used soon so that the unnecessary include would have
become useful soon anyway, even if it had not been spotted now.

On 2012/11/19 21:14:17, oshima wrote:

[oshima, 2012/11/19 22:53:12]

I understand, but we generally advise to add it when you need it, not when
you will need it. This is because many people are working on the same files and
not everyone would know why it's there, and such line may be deleted by
other people.

[bartfab (slow), 2012/11/19 22:57:55]

Absolutely. It was a mistake.

On 2012/11/19 22:53:12, oshima wrote:

 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ skipping 221 matching lines @@
   views::Label* username_;
   views::Label* email_;
 
   views::Button* signout_;
 
   DISALLOW_COPY_AND_ASSIGN(UserView);
 };
 
 }  // namespace tray
 
-TrayUser::TrayUser()
-    : user_(NULL),
+TrayUser::TrayUser(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      user_(NULL),
       avatar_(NULL),
       label_(NULL) {
 }
 
 TrayUser::~TrayUser() {
 }
 
 views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
   CHECK(avatar_ == NULL);
   CHECK(label_ == NULL);
@@ skipping 86 matching lines @@
   // Check for null to avoid crbug.com/150944.
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash