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

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

Issue 2445843002: chromeos: Convert "show other network" dialog to work with mash (Closed)
Patch Set: tweak 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
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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 base::Bind(&base::DoNothing), 567 base::Bind(&base::DoNothing),
568 base::Bind(&base::DoNothing)); 568 base::Bind(&base::DoNothing));
569 } 569 }
570 570
571 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog( 571 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog(
572 const std::string& type) { 572 const std::string& type) {
573 if (type == shill::kTypeCellular) { 573 if (type == shill::kTypeCellular) {
574 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow()); 574 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
575 return; 575 return;
576 } 576 }
577 NetworkConfigView::ShowForType(type, GetNativeWindow()); 577 NetworkConfigView::ShowForTypeInContainer(
578 type, SystemTrayClient::GetDialogParentContainerId());
578 } 579 }
579 580
580 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() { 581 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
581 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent(); 582 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent();
582 } 583 }
583 584
584 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() { 585 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
585 return bluetooth_adapter_ && bluetooth_adapter_->IsPowered(); 586 return bluetooth_adapter_ && bluetooth_adapter_->IsPowered();
586 } 587 }
587 588
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1113 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1113 << "ENABLE_SUPERVISED_USERS undefined."; 1114 << "ENABLE_SUPERVISED_USERS undefined.";
1114 return base::string16(); 1115 return base::string16();
1115 } 1116 }
1116 1117
1117 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1118 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1118 return new SystemTrayDelegateChromeOS(); 1119 return new SystemTrayDelegateChromeOS();
1119 } 1120 }
1120 1121
1121 } // namespace chromeos 1122 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698