Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 167 matching lines @@
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
   UserAddingScreen::Get()->Start();
 }
 
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : user_profile_(NULL),
-      clock_type_(base::GetHourClockType()),
       search_key_mapped_to_(input_method::kSearchKey),
       screen_locked_(false),
       have_session_start_time_(false),
       have_session_length_limit_(false),
       should_run_bluetooth_discovery_(false),
       session_started_(false),
       cast_config_delegate_(nullptr),
       networking_config_delegate_(new NetworkingConfigDelegateChromeos()),
       volume_control_delegate_(new VolumeController()),
       vpn_delegate_(new VPNDelegateChromeOS),
@@ skipping 30 matching lines @@
       new ShutdownPolicyHandler(CrosSettings::Get(), this));
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
   input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 
-  g_browser_process->platform_part()->GetSystemClock()->AddObserver(this);
-
-  OnSystemClockChanged(g_browser_process->platform_part()->GetSystemClock());
-
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&SystemTrayDelegateChromeOS::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
 
   ash::WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->AddAudioObserver(this);
 
   BrowserList::AddObserver(this);
@@ skipping 33 matching lines @@
   // Unregister PrefChangeRegistrars.
   local_state_registrar_.reset();
   user_pref_registrar_.reset();
 
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
-  g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
   if (bluetooth_adapter_)
     bluetooth_adapter_->RemoveObserver(this);
   ash::WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(
       this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
@@ skipping 89 matching lines @@
 
 bool SystemTrayDelegateChromeOS::IsUserChild() const {
   return user_manager::UserManager::Get()->IsLoggedInAsChildUser();
 }
 
 void SystemTrayDelegateChromeOS::GetSystemUpdateInfo(
     ash::UpdateInfo* info) const {
   GetUpdateInfo(UpgradeDetector::GetInstance(), info);
 }
 
-base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
-  return clock_type_;
-}
-
 void SystemTrayDelegateChromeOS::ShowSettings() {
   SystemTrayCommon::ShowSettings();
 }
 
 bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
   ash::WmShell* wm_shell = ash::WmShell::Get();
   return ChromeUserManager::Get()->GetCurrentUserFlow()->ShouldShowSettings() &&
          !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
-void SystemTrayDelegateChromeOS::ShowDateSettings() {
-  SystemTrayCommon::ShowDateSettings();
-}
-
 void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
   // TODO(mash): Refactor out GetNativeWindow and move to SystemTrayCommon.
   SetTimeDialog::ShowDialog(GetNativeWindow());
 }
 
 void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
     const std::string& guid) {
   // TODO(mash): Refactor out SessionStateDelegate and move to SystemTrayCommon.
   ash::WmShell* wm_shell = ash::WmShell::Get();
   if (LoginState::Get()->IsUserLoggedIn() &&
@@ skipping 473 matching lines @@
 }
 
 bool SystemTrayDelegateChromeOS::UnsetProfile(Profile* profile) {
   if (profile != user_profile_)
     return false;
   user_pref_registrar_.reset();
   user_profile_ = NULL;
   return true;
 }
 
-bool SystemTrayDelegateChromeOS::GetShouldUse24HourClockForTesting() const {
-  return g_browser_process->platform_part()
-      ->GetSystemClock()
-      ->ShouldUse24HourClock();
-}
-
-void SystemTrayDelegateChromeOS::OnSystemClockChanged(
-    system::SystemClock* system_clock) {
-  const bool use_24_hour_clock = system_clock->ShouldUse24HourClock();
-  clock_type_ = use_24_hour_clock ? base::k24HourClock : base::k12HourClock;
-  GetSystemTrayNotifier()->NotifyDateFormatChanged();
-}
-
 void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
   GetSystemTrayNotifier()->NotifyShowLoginButtonChanged(
       user_pref_registrar_->prefs()->GetBoolean(
           prefs::kShowLogoutButtonInTray));
 }
 
 void SystemTrayDelegateChromeOS::UpdateLogoutDialogDuration() {
   const int duration_ms =
       user_pref_registrar_->prefs()->GetInteger(prefs::kLogoutDialogDurationMs);
   GetSystemTrayNotifier()->NotifyLogoutDialogDurationChanged(
@@ skipping 352 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos