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

Unified Diff: ash/common/system/tray/system_tray_controller.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_controller.cc
diff --git a/ash/common/system/tray/system_tray_controller.cc b/ash/common/system/tray/system_tray_controller.cc
deleted file mode 100644
index c4317df16ace9a69fff38b061048252d57f15b3c..0000000000000000000000000000000000000000
--- a/ash/common/system/tray/system_tray_controller.cc
+++ /dev/null
@@ -1,181 +0,0 @@
-// 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 "ash/common/system/tray/system_tray_controller.h"
-
-#include "ash/common/system/tray/system_tray.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/system/update/tray_update.h"
-#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.h"
-#include "ash/root_window_controller.h"
-
-namespace ash {
-
-SystemTrayController::SystemTrayController()
- : hour_clock_type_(base::GetHourClockType()) {}
-
-SystemTrayController::~SystemTrayController() {}
-
-void SystemTrayController::ShowSettings() {
- if (system_tray_client_)
- system_tray_client_->ShowSettings();
-}
-
-void SystemTrayController::ShowDateSettings() {
- if (system_tray_client_)
- system_tray_client_->ShowDateSettings();
-}
-
-void SystemTrayController::ShowSetTimeDialog() {
- if (system_tray_client_)
- system_tray_client_->ShowSetTimeDialog();
-}
-
-void SystemTrayController::ShowDisplaySettings() {
- if (system_tray_client_)
- system_tray_client_->ShowDisplaySettings();
-}
-
-void SystemTrayController::ShowPowerSettings() {
- if (system_tray_client_)
- system_tray_client_->ShowPowerSettings();
-}
-
-void SystemTrayController::ShowChromeSlow() {
- if (system_tray_client_)
- system_tray_client_->ShowChromeSlow();
-}
-
-void SystemTrayController::ShowIMESettings() {
- if (system_tray_client_)
- system_tray_client_->ShowIMESettings();
-}
-
-void SystemTrayController::ShowHelp() {
- if (system_tray_client_)
- system_tray_client_->ShowHelp();
-}
-
-void SystemTrayController::ShowAccessibilityHelp() {
- if (system_tray_client_)
- system_tray_client_->ShowAccessibilityHelp();
-}
-
-void SystemTrayController::ShowAccessibilitySettings() {
- if (system_tray_client_)
- system_tray_client_->ShowAccessibilitySettings();
-}
-
-void SystemTrayController::ShowPaletteHelp() {
- if (system_tray_client_)
- system_tray_client_->ShowPaletteHelp();
-}
-
-void SystemTrayController::ShowPaletteSettings() {
- if (system_tray_client_)
- system_tray_client_->ShowPaletteSettings();
-}
-
-void SystemTrayController::ShowPublicAccountInfo() {
- if (system_tray_client_)
- system_tray_client_->ShowPublicAccountInfo();
-}
-
-void SystemTrayController::ShowNetworkConfigure(const std::string& network_id) {
- if (system_tray_client_)
- system_tray_client_->ShowNetworkConfigure(network_id);
-}
-
-void SystemTrayController::ShowNetworkCreate(const std::string& type) {
- if (system_tray_client_)
- system_tray_client_->ShowNetworkCreate(type);
-}
-
-void SystemTrayController::ShowThirdPartyVpnCreate(
- const std::string& extension_id) {
- if (system_tray_client_)
- system_tray_client_->ShowThirdPartyVpnCreate(extension_id);
-}
-
-void SystemTrayController::ShowNetworkSettings(const std::string& network_id) {
- if (system_tray_client_)
- system_tray_client_->ShowNetworkSettings(network_id);
-}
-
-void SystemTrayController::ShowProxySettings() {
- if (system_tray_client_)
- system_tray_client_->ShowProxySettings();
-}
-
-void SystemTrayController::SignOut() {
- if (system_tray_client_)
- system_tray_client_->SignOut();
-}
-
-void SystemTrayController::RequestRestartForUpdate() {
- if (system_tray_client_)
- system_tray_client_->RequestRestartForUpdate();
-}
-
-void SystemTrayController::BindRequest(mojom::SystemTrayRequest request) {
- bindings_.AddBinding(this, std::move(request));
-}
-
-void SystemTrayController::SetClient(mojom::SystemTrayClientPtr client) {
- system_tray_client_ = std::move(client);
-}
-
-void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {
- ash::SystemTray* tray =
- WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
- if (!tray)
- return;
-
- // We disable the UI to prevent user from interacting with UI elements,
- // particularly with the system tray menu. However, in case if the system tray
- // bubble is opened at this point, it remains opened and interactive even
- // after SystemTray::SetEnabled(false) call, which can be dangerous
- // (http://crbug.com/497080). Close the menu to fix it. Calling
- // SystemTray::SetEnabled(false) guarantees, that the menu will not be opened
- // until the UI is enabled again.
- if (!enabled && tray->HasSystemBubble())
- tray->CloseSystemBubble();
-
- tray->SetEnabled(enabled);
-}
-
-void SystemTrayController::SetPrimaryTrayVisible(bool visible) {
- ash::SystemTray* tray =
- WmShell::Get()->GetPrimaryRootWindowController()->GetSystemTray();
- if (!tray)
- return;
-
- tray->SetVisible(visible);
- tray->GetWidget()->SetOpacity(visible ? 1.f : 0.f);
- if (visible) {
- tray->GetWidget()->Show();
- } else {
- tray->GetWidget()->Hide();
- }
-}
-
-void SystemTrayController::SetUse24HourClock(bool use_24_hour) {
- hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;
- WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();
-}
-
-void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
- bool factory_reset_required) {
- // Show the icon on all displays.
- for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
- ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
- // External monitors might not have a tray yet.
- if (!tray)
- continue;
- tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required);
- }
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698