Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
 #include "chrome/browser/chromeos/system/system_clock.h"

[msw, 2016/09/30 23:26:49]

nit: remove

[James Cook, 2016/10/03 18:07:56]

Done.

 #include "chrome/browser/chromeos/system/system_clock_observer.h"

[msw, 2016/09/30 23:26:49]

nit: remove

[James Cook, 2016/10/03 18:07:56]

Done.

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 23 matching lines @@
       public input_method::InputMethodManager::Observer,
       public chromeos::CrasAudioHandler::AudioObserver,
       public device::BluetoothAdapter::Observer,
       public policy::CloudPolicyStore::Observer,
       public ash::SessionStateObserver,
       public chrome::BrowserListObserver,
       public extensions::AppWindowRegistry::Observer,
       public user_manager::UserManager::UserSessionStateObserver,
       public SupervisedUserServiceObserver,
       public ShutdownPolicyHandler::Delegate,
-      public system::SystemClockObserver,
       public input_method::InputMethodManager::ImeMenuObserver {
  public:
   SystemTrayDelegateChromeOS();
 
   ~SystemTrayDelegateChromeOS() override;
 
   void InitializeOnAdapterReady(
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Overridden from ash::SystemTrayDelegate:
   void Initialize() override;
   bool GetTrayVisibilityOnStartup() override;
   ash::LoginStatus GetUserLoginStatus() const override;
   std::string GetEnterpriseDomain() const override;
   base::string16 GetEnterpriseMessage() const override;
   std::string GetSupervisedUserManager() const override;
   base::string16 GetSupervisedUserManagerName() const override;
   base::string16 GetSupervisedUserMessage() const override;
   bool IsUserSupervised() const override;
   bool IsUserChild() const override;
   void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
-  base::HourClockType GetHourClockType() const override;
   void ShowSettings() override;
   bool ShouldShowSettings() override;
-  void ShowDateSettings() override;
   void ShowSetTimeDialog() override;
   void ShowNetworkSettingsForGuid(const std::string& guid) override;
   void ShowDisplaySettings() override;
   void ShowPowerSettings() override;
   void ShowChromeSlow() override;
   bool ShouldShowDisplayNotification() override;
   void ShowIMESettings() override;
   void ShowHelp() override;
   void ShowAccessibilityHelp() override;
   void ShowAccessibilitySettings() override;
@@ skipping 46 matching lines @@
   std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
       ash::SystemTray* tray) override;
 
   // Overridden from user_manager::UserManager::UserSessionStateObserver:
   void UserAddedToSession(const user_manager::User* active_user) override;
   void ActiveUserChanged(const user_manager::User* active_user) override;
 
   void UserChangedChildStatus(user_manager::User* user) override;
 
   // browser tests need to call ShouldUse24HourClock().
   bool GetShouldUse24HourClockForTesting() const;

[msw, 2016/09/30 23:26:49]

nit: can we remove this? (make tests call a new SystemTrayClient accessor?)

[James Cook, 2016/10/03 18:07:56]

I inlined the implementation in the one test that needed it.

 
-  // chromeos::system::SystemClockObserver implementation.
-  void OnSystemClockChanged(system::SystemClock*) override;
-
  private:
   ash::SystemTray* GetPrimarySystemTray();
 
   ash::SystemTrayNotifier* GetSystemTrayNotifier();
 
   void SetProfile(Profile* profile);
 
   bool UnsetProfile(Profile* profile);
 
   bool ShouldUse24HourClock() const;

[msw, 2016/09/30 23:26:49]

nit: can we remove this? (is this even defined anywhere?)

[James Cook, 2016/10/03 18:07:56]

Done.

 
   void UpdateShowLogoutButtonInTray();
 
   void UpdateLogoutDialogDuration();
 
   void UpdateSessionStartTime();
 
   void UpdateSessionLengthLimit();
 
   void StopObservingAppWindowRegistry();
@@ skipping 91 matching lines @@
       override;
 
   // helper methods used by GetSupervisedUserMessage.
   const base::string16 GetLegacySupervisedUserMessage() const;
   const base::string16 GetChildUserMessage() const;
 
   std::unique_ptr<content::NotificationRegistrar> registrar_;
   std::unique_ptr<PrefChangeRegistrar> local_state_registrar_;
   std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
   Profile* user_profile_;
   base::HourClockType clock_type_;

[msw, 2016/09/30 23:26:49]

nit: remove

[James Cook, 2016/10/03 18:07:56]

Done.

   int search_key_mapped_to_;
   bool screen_locked_;
   bool have_session_start_time_;
   base::TimeTicks session_start_time_;
   bool have_session_length_limit_;
   base::TimeDelta session_length_limit_;
   std::string enterprise_domain_;
   bool should_run_bluetooth_discovery_;
   bool session_started_;
 
@@ skipping 14 matching lines @@
 
   base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_