Do not activate system tray bubble by default

ash/common/system/chromeos/settings/tray_settings.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/common/system/chromeos/settings/tray_settings.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/power_status_view.h"
@@ skipping 16 matching lines @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 namespace tray {
 
 class SettingsDefaultView : public ActionableView,
                             public PowerStatus::Observer {
  public:
-  explicit SettingsDefaultView(LoginStatus status)
-      : login_status_(status), label_(NULL), power_status_view_(NULL) {
+  SettingsDefaultView(SystemTrayItem* owner, LoginStatus status)
+      : ActionableView(owner),
+        login_status_(status),
+        label_(nullptr),
+        power_status_view_(nullptr) {
     PowerStatus::Get()->AddObserver(this);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           ash::kTrayPopupPaddingHorizontal, 0,
                                           ash::kTrayPopupPaddingBetweenItems));
 
     bool power_view_right_align = false;
     if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
         login_status_ != LoginStatus::LOCKED &&
         !WmShell::Get()
              ->GetSessionStateDelegate()
@@ skipping 30 matching lines @@
 
   // Overridden from ash::ActionableView.
   bool PerformAction(const ui::Event& event) override {
     if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
         login_status_ == LoginStatus::LOCKED ||
         WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
       return false;
     }
 
     WmShell::Get()->system_tray_delegate()->ShowSettings();
+    CloseSystemBubble();
     return true;
   }
 
   // Overridden from views::View.
   void Layout() override {
     views::View::Layout();
 
     if (label_ && power_status_view_) {
       // Let the box-layout do the layout first. Then move power_status_view_
       // to right align if it is created.
@@ skipping 33 matching lines @@
 };
 
 }  // namespace tray
 
 TraySettings::TraySettings(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_SETTINGS), default_view_(nullptr) {}
 
 TraySettings::~TraySettings() {}
 
 views::View* TraySettings::CreateTrayView(LoginStatus status) {
-  return NULL;
+  return nullptr;
 }
 
 views::View* TraySettings::CreateDefaultView(LoginStatus status) {
   if ((status == LoginStatus::NOT_LOGGED_IN || status == LoginStatus::LOCKED) &&
       !PowerStatus::Get()->IsBatteryPresent())
-    return NULL;
+    return nullptr;
   if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
-    return NULL;
-  CHECK(default_view_ == NULL);
-  default_view_ = new tray::SettingsDefaultView(status);
+    return nullptr;
+  CHECK(default_view_ == nullptr);
+  default_view_ = new tray::SettingsDefaultView(this, status);
   return default_view_;
 }
 
 views::View* TraySettings::CreateDetailedView(LoginStatus status) {
   NOTIMPLEMENTED();
-  return NULL;
+  return nullptr;
 }
 
 void TraySettings::DestroyTrayView() {}
 
 void TraySettings::DestroyDefaultView() {
-  default_view_ = NULL;
+  default_view_ = nullptr;
 }
 
 void TraySettings::DestroyDetailedView() {}
 
 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 }  // namespace ash