| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/status/network_menu.h" | 5 #include "chrome/browser/chromeos/status/network_menu.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 bool NetworkMenuModel::IsItemCheckedAt(int index) const { | 370 bool NetworkMenuModel::IsItemCheckedAt(int index) const { |
| 371 // All ui::MenuModel::TYPE_CHECK menu items are checked. | 371 // All ui::MenuModel::TYPE_CHECK menu items are checked. |
| 372 return true; | 372 return true; |
| 373 } | 373 } |
| 374 | 374 |
| 375 int NetworkMenuModel::GetGroupIdAt(int index) const { | 375 int NetworkMenuModel::GetGroupIdAt(int index) const { |
| 376 return 0; | 376 return 0; |
| 377 } | 377 } |
| 378 | 378 |
| 379 bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) { | 379 bool NetworkMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) { |
| 380 if (!menu_items_[index].icon.empty()) { | 380 if (!menu_items_[index].icon.isNull()) { |
| 381 *icon = menu_items_[index].icon; | 381 *icon = menu_items_[index].icon; |
| 382 return true; | 382 return true; |
| 383 } | 383 } |
| 384 return false; | 384 return false; |
| 385 } | 385 } |
| 386 | 386 |
| 387 ui::ButtonMenuItemModel* NetworkMenuModel::GetButtonMenuItemAt( | 387 ui::ButtonMenuItemModel* NetworkMenuModel::GetButtonMenuItemAt( |
| 388 int index) const { | 388 int index) const { |
| 389 return NULL; | 389 return NULL; |
| 390 } | 390 } |
| (...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 | 1102 |
| 1103 void NetworkMenu::ShowOtherWifi() { | 1103 void NetworkMenu::ShowOtherWifi() { |
| 1104 NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow()); | 1104 NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow()); |
| 1105 } | 1105 } |
| 1106 | 1106 |
| 1107 void NetworkMenu::ShowOtherCellular() { | 1107 void NetworkMenu::ShowOtherCellular() { |
| 1108 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow()); | 1108 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow()); |
| 1109 } | 1109 } |
| 1110 | 1110 |
| 1111 } // namespace chromeos | 1111 } // namespace chromeos |
| OLD | NEW |