Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2449)

Unified Diff: chrome/browser/ui/ash/system_tray_client.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: cleanup Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_client.cc
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc
index df8c5e0b1578c95c8197fde50f23316bbdc9fd15..1ecaea3a98dbaa785aa8361b5e37e2c8b0ecb993 100644
--- a/chrome/browser/ui/ash/system_tray_client.cc
+++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -9,9 +9,15 @@
#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 {
@@ -65,7 +71,14 @@ void SystemTrayClient::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() {

Powered by Google App Engine
This is Rietveld 408576698