Merge 240486 "Implement the spring charger replacement UI and ad..."

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
+#include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/ime/extension_ime_util.h"
@@ skipping 592 matching lines @@
     // TODO(nkostylev): Adjust this limitation based on device capabilites.
     // http://crbug.com/230865
     if (UserManager::Get()->GetLoggedInUsers().size() >= 3)
       return;
 
     // Launch sign in screen to add another user to current session.
     if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size())
       UserAddingScreen::Get()->Start();
   }
 
+  virtual void ShowSpringChargerReplacementDialog() OVERRIDE {
+    if (!ChargerReplacementDialog::ShouldShowDialog())
+      return;
+
+    ChargerReplacementDialog* dialog =
+        new ChargerReplacementDialog(GetNativeWindow());
+    dialog->Show();
+  }
+
+  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE {
+    return ChargerReplacementHandler::GetChargerStatusPref() ==
+        ChargerReplacementHandler::CONFIRM_SAFE_CHARGER;
+  }
+
   virtual void ShutDown() OVERRIDE {
     ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
   }
 
   virtual void SignOut() OVERRIDE {
     chrome::AttemptUserExit();
   }
 
   virtual void RequestLockScreen() OVERRIDE {
     // TODO(antrim) : additional logging for crbug/173178
@@ skipping 635 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos