Make spacing between uber tray items consistent with UI spec.

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"
@@ skipping 222 matching lines @@
 }
 
 void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
   if (tray_label_) {
     if (current.third_party) {
       tray_label_->label()->SetText(current.short_name + UTF8ToUTF16("*"));
     } else {
       tray_label_->label()->SetText(current.short_name);
     }
     tray_label_->SetVisible(count > 1);
+    SetTrayLabelItemBorder(tray_label_,
+        ash::Shell::GetInstance()->system_tray()->shelf_alignment());
+    tray_label_->Layout();
   }
 }
 
 views::View* TrayIME::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_label_ == NULL);
   tray_label_ = new TrayItemView;
   tray_label_->CreateLabel();
   SetupLabelForTray(tray_label_->label());
-  tray_label_->label()->set_border(
-      views::Border::CreateEmptyBorder(0, 2, 0, 2));
+  UpdateAfterShelfAlignmentChange(
+      ash::Shell::GetInstance()->system_tray()->shelf_alignment());

[sadrul, 2012/07/19 16:46:28]

Looks like this is necessary in all CreateTrayView. I would suggest either
sending the alignment as a param, or calling UpdateAfterShelfAlignmentChange
after the call to CreateTrayView in SystemTray.

[jennyz, 2012/07/19 18:33:33]

Done.

   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)
@@ skipping 28 matching lines @@
   detailed_ = NULL;
 }
 
 void TrayIME::DestroyNotificationView() {
   notification_ = NULL;
 }
 
 void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
+void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+  SetTrayLabelItemBorder(tray_label_, alignment);

[sadrul, 2012/07/19 16:46:28]

This also seems to be necessary for all items. So I would rather just call
SetTrayLabelItemBorder from the default implementation, instead of overriding
this for every item.

[jennyz, 2012/07/19 18:33:33]

This may require some more refactoring, since SystemTrayItem does not own the
tray_view from CreateTrayView, and each kind of tray may create different kind
of view object. TrayImageItem does cover a lot of tray items, so that we only
need to handle UpdateAfterShelfAlignment in that class.   But others like
TrayUser, TrayNetwork, TrayPower, TrayIME, TrayDate, etc, each create its own
tray_view, and knows what kind of  view it created by themselves, it could be
either an image or label. So it is hard to handle in the default handler in
parent class. One possible refactoring may be to add some base class like the
way we did for TrayImageItem for label tray item, and handle the default
UpdateAfterShelfAlignment there, any suggestion? And do we want to do this for
this cl?

+}
+
 void TrayIME::OnIMERefresh(bool show_message) {
   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_)
     default_->UpdateLabel(current);
   if (detailed_)
     detailed_->Update(list, property_list);
 
   if (list.size() > 1 && show_message && !message_shown_) {
     if (!notification_) {
       ShowNotificationView();
       message_shown_ = true;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash