Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 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_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/ash/system_tray_common.h"
+#include "chrome/common/url_constants.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "services/shell/public/cpp/connector.h"
+#include "content/public/browser/user_metrics.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 SystemTrayClient* g_instance = nullptr;
 
 }  // namespace
 
 SystemTrayClient::SystemTrayClient() {
   // If this observes clock setting changes before ash comes up the IPCs will
   // be queued on |system_tray_|.
@@ skipping 33 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   SystemTrayCommon::ShowSettings();
 }
 
 void SystemTrayClient::ShowDateSettings() {
-  SystemTrayCommon::ShowDateSettings();
+  // REVIEWERS: SystemTrayCommon is not needed with this approach.
+  content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
+  std::string sub_page =
+      std::string(chrome::kSearchSubPage) + "#" +
+      l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+  // Everybody can change the time zone (even though it is a device setting).
+  chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
+                                        sub_page);
 }
 
 void SystemTrayClient::ShowDisplaySettings() {
   SystemTrayCommon::ShowDisplaySettings();
 }
 
 void SystemTrayClient::ShowChromeSlow() {
   SystemTrayCommon::ShowChromeSlow();
 }
 
@@ skipping 30 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // chromeos::system::SystemClockObserver:
 
 void SystemTrayClient::OnSystemClockChanged(
     chromeos::system::SystemClock* clock) {
   ConnectToSystemTray();
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }