Fix uber tray crash on stumpy which has no battery

ash/system/settings/tray_settings.cc

Index: ash/system/settings/tray_settings.cc
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc
index 49ba7300694f58cece954c67fe5ab218e4bb3fc0..a9888541447c8d91ed08e3dab003643b304917a7 100644
--- a/ash/system/settings/tray_settings.cc
+++ b/ash/system/settings/tray_settings.cc
@@ -69,13 +69,14 @@ class SettingsDefaultView : public ash::internal::ActionableView {
   virtual ~SettingsDefaultView() {}
 
   void UpdatePowerStatus(const PowerSupplyStatus& status) {
-    if (power_status_view_)
+    if (power_status_view_) {

[stevenjb, 2012/11/30 20:36:44]

nit: if (!power_status_view_) return;?

[oshima, 2012/11/30 21:23:22]

agreed. done.

       power_status_view_->UpdatePowerStatus(status);
-    string16 accessible_name = label_ ?
-        label_->text() + ASCIIToUTF16(", ") +
-            power_status_view_->accessible_name() :
-        power_status_view_->accessible_name();
-    SetAccessibleName(accessible_name);
+      string16 accessible_name = label_ ?
+          label_->text() + ASCIIToUTF16(", ") +
+              power_status_view_->accessible_name() :
+          power_status_view_->accessible_name();
+      SetAccessibleName(accessible_name);
+    }
   }
 
   // Overridden from ash::internal::ActionableView.