| OLD | NEW |
| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "device/bluetooth/bluetooth_adapter_factory.h" | 103 #include "device/bluetooth/bluetooth_adapter_factory.h" |
| 104 #include "device/bluetooth/bluetooth_device.h" | 104 #include "device/bluetooth/bluetooth_device.h" |
| 105 #include "third_party/cros_system_api/dbus/service_constants.h" | 105 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 106 #include "ui/base/ime/chromeos/extension_ime_util.h" | 106 #include "ui/base/ime/chromeos/extension_ime_util.h" |
| 107 #include "ui/base/ime/chromeos/ime_keyboard.h" | 107 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 108 #include "ui/base/ime/chromeos/input_method_manager.h" | 108 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 109 #include "ui/base/l10n/l10n_util.h" | 109 #include "ui/base/l10n/l10n_util.h" |
| 110 #include "ui/base/l10n/time_format.h" | 110 #include "ui/base/l10n/time_format.h" |
| 111 #include "ui/chromeos/ime/input_method_menu_item.h" | 111 #include "ui/chromeos/ime/input_method_menu_item.h" |
| 112 #include "ui/chromeos/ime/input_method_menu_manager.h" | 112 #include "ui/chromeos/ime/input_method_menu_manager.h" |
| 113 #include "ui/views/widget/widget_parent.h" |
| 113 | 114 |
| 114 #if defined(ENABLE_SUPERVISED_USERS) | 115 #if defined(ENABLE_SUPERVISED_USERS) |
| 115 #include "chrome/browser/supervised_user/supervised_user_service.h" | 116 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 116 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 117 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 117 #endif | 118 #endif |
| 118 | 119 |
| 119 namespace chromeos { | 120 namespace chromeos { |
| 120 | 121 |
| 121 namespace { | 122 namespace { |
| 122 | 123 |
| (...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 base::Bind(&base::DoNothing), | 570 base::Bind(&base::DoNothing), |
| 570 base::Bind(&base::DoNothing)); | 571 base::Bind(&base::DoNothing)); |
| 571 } | 572 } |
| 572 | 573 |
| 573 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog( | 574 void SystemTrayDelegateChromeOS::ShowOtherNetworkDialog( |
| 574 const std::string& type) { | 575 const std::string& type) { |
| 575 if (type == shill::kTypeCellular) { | 576 if (type == shill::kTypeCellular) { |
| 576 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow()); | 577 ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow()); |
| 577 return; | 578 return; |
| 578 } | 579 } |
| 579 NetworkConfigView::ShowForType(type, GetNativeWindow()); | 580 views::WidgetParent widget_parent; |
| 581 widget_parent.native_parent = GetNativeWindow(); |
| 582 NetworkConfigView::ShowForType(type, widget_parent); |
| 580 } | 583 } |
| 581 | 584 |
| 582 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() { | 585 bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() { |
| 583 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent(); | 586 return bluetooth_adapter_ && bluetooth_adapter_->IsPresent(); |
| 584 } | 587 } |
| 585 | 588 |
| 586 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() { | 589 bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() { |
| 587 return bluetooth_adapter_ && bluetooth_adapter_->IsPowered(); | 590 return bluetooth_adapter_ && bluetooth_adapter_->IsPowered(); |
| 588 } | 591 } |
| 589 | 592 |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1124 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1127 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1125 << "ENABLE_SUPERVISED_USERS undefined."; | 1128 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1126 return base::string16(); | 1129 return base::string16(); |
| 1127 } | 1130 } |
| 1128 | 1131 |
| 1129 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1132 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1130 return new SystemTrayDelegateChromeOS(); | 1133 return new SystemTrayDelegateChromeOS(); |
| 1131 } | 1134 } |
| 1132 | 1135 |
| 1133 } // namespace chromeos | 1136 } // namespace chromeos |
| OLD | NEW |