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

Side by Side Diff: ash/common/system/tray/system_tray_controller.cc

Issue 2764643003: cros: Move TrayBluetoothHelper out of chrome into ash (Closed)
Patch Set: rebase fix 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 unified diff | Download patch
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/tray/system_tray_controller.h" 5 #include "ash/common/system/tray/system_tray_controller.h"
6 6
7 #include "ash/common/system/tray/system_tray.h" 7 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/common/system/tray/system_tray_notifier.h" 8 #include "ash/common/system/tray/system_tray_notifier.h"
9 #include "ash/common/system/update/tray_update.h" 9 #include "ash/common/system/update/tray_update.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 10 matching lines...) Expand all
21 void SystemTrayController::ShowSettings() { 21 void SystemTrayController::ShowSettings() {
22 if (system_tray_client_) 22 if (system_tray_client_)
23 system_tray_client_->ShowSettings(); 23 system_tray_client_->ShowSettings();
24 } 24 }
25 25
26 void SystemTrayController::ShowBluetoothSettings() { 26 void SystemTrayController::ShowBluetoothSettings() {
27 if (system_tray_client_) 27 if (system_tray_client_)
28 system_tray_client_->ShowBluetoothSettings(); 28 system_tray_client_->ShowBluetoothSettings();
29 } 29 }
30 30
31 void SystemTrayController::ShowBluetoothPairingDialog(
32 const std::string& address,
33 const base::string16& name_for_display,
34 bool paired,
35 bool connected) {
36 if (system_tray_client_) {
37 system_tray_client_->ShowBluetoothPairingDialog(address, name_for_display,
38 paired, connected);
39 }
40 }
41
31 void SystemTrayController::ShowDateSettings() { 42 void SystemTrayController::ShowDateSettings() {
32 if (system_tray_client_) 43 if (system_tray_client_)
33 system_tray_client_->ShowDateSettings(); 44 system_tray_client_->ShowDateSettings();
34 } 45 }
35 46
36 void SystemTrayController::ShowSetTimeDialog() { 47 void SystemTrayController::ShowSetTimeDialog() {
37 if (system_tray_client_) 48 if (system_tray_client_)
38 system_tray_client_->ShowSetTimeDialog(); 49 system_tray_client_->ShowSetTimeDialog();
39 } 50 }
40 51
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) { 188 for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
178 ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray(); 189 ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
179 // External monitors might not have a tray yet. 190 // External monitors might not have a tray yet.
180 if (!tray) 191 if (!tray)
181 continue; 192 continue;
182 tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required); 193 tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required);
183 } 194 }
184 } 195 }
185 196
186 } // namespace ash 197 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698