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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2446573003: chromeos: Make "mobile network" and "set time" dialogs work with mash (Closed)
Patch Set: gn check Created 4 years, 1 month 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 | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/web_dialog_util.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 557
558 void SystemTrayDelegateChromeOS::ToggleBluetooth() { 558 void SystemTrayDelegateChromeOS::ToggleBluetooth() {
559 bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(), 559 bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
560 base::Bind(&base::DoNothing), 560 base::Bind(&base::DoNothing),
561 base::Bind(&base::DoNothing)); 561 base::Bind(&base::DoNothing));
562 } 562 }
563 563
564 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog( 564 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog(
565 const std::string& type) { 565 const std::string& type) {
566 if (type == shill::kTypeCellular) { 566 if (type == shill::kTypeCellular) {
567 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow()); 567 ChooseMobileNetworkDialog::ShowDialogInContainer(
568 SystemTrayClient::GetDialogParentContainerId());
568 return; 569 return;
569 } 570 }
570 NetworkConfigView::ShowForTypeInContainer( 571 NetworkConfigView::ShowForTypeInContainer(
571 type, SystemTrayClient::GetDialogParentContainerId()); 572 type, SystemTrayClient::GetDialogParentContainerId());
572 } 573 }
573 574
574 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() { 575 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
575 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent(); 576 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent();
576 } 577 }
577 578
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1107 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1107 << "ENABLE_SUPERVISED_USERS undefined."; 1108 << "ENABLE_SUPERVISED_USERS undefined.";
1108 return base::string16(); 1109 return base::string16();
1109 } 1110 }
1110 1111
1111 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1112 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1112 return new SystemTrayDelegateChromeOS(); 1113 return new SystemTrayDelegateChromeOS();
1113 } 1114 }
1114 1115
1115 } // namespace chromeos 1116 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/web_dialog_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698