diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 01:43:18 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 01:43:18 +0000 |
| commit | 15441050cd7deadfce98b3556f5f3c9b2ce79745 (patch) | |
| tree | 60cac4f26adc2755a8513a63f9226eaf0c178a1c /chrome/browser/chromeos/cros | |
| parent | 8de38752e3233390443ed76dd0e13429fe5b4531 (diff) | |
| download | chromium_src-15441050cd7deadfce98b3556f5f3c9b2ce79745.zip chromium_src-15441050cd7deadfce98b3556f5f3c9b2ce79745.tar.gz chromium_src-15441050cd7deadfce98b3556f5f3c9b2ce79745.tar.bz2 | |
Add 3G Activation to the network menu.
This includes some cleanup of the network_menu code to work with or without DOMUI menus.
BUG=http://code.google.com/p/chromium-os/issues/detail?id=8114
TEST=All of the network menu
Review URL: http://codereview.chromium.org/4136002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
| -rw-r--r-- | chrome/browser/chromeos/cros/cros_mock.cc | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc index 6e7844f..25bf9aa 100644 --- a/chrome/browser/chromeos/cros/cros_mock.cc +++ b/chrome/browser/chromeos/cros/cros_mock.cc @@ -275,7 +275,7 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() { // NetworkDropdownButton::NetworkChanged() calls: EXPECT_CALL(*mock_network_library_, ethernet_connected()) - .Times(2) // also called by NetworkMenu::InitMenuItems() + .Times(1) .WillRepeatedly((Return(false))) .RetiresOnSaturation(); EXPECT_CALL(*mock_network_library_, wifi_connected()) @@ -295,7 +295,7 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() { .WillRepeatedly((Return(false))) .RetiresOnSaturation(); EXPECT_CALL(*mock_network_library_, Connected()) - .Times(2) // also called by NetworkMenu::InitMenuItems() + .Times(1) .WillRepeatedly((Return(false))) .RetiresOnSaturation(); EXPECT_CALL(*mock_network_library_, Connecting()) @@ -304,29 +304,21 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() { .RetiresOnSaturation(); // NetworkMenu::InitMenuItems() calls: - EXPECT_CALL(*mock_network_library_, ethernet_connecting()) - .Times(1) - .WillRepeatedly((Return(false))) - .RetiresOnSaturation(); - EXPECT_CALL(*mock_network_library_, wifi_networks()) + EXPECT_CALL(*mock_network_library_, ethernet_available()) .Times(1) - .WillRepeatedly((ReturnRef(wifi_networks_))) + .WillRepeatedly((Return(true))) .RetiresOnSaturation(); - EXPECT_CALL(*mock_network_library_, wifi_available()) + EXPECT_CALL(*mock_network_library_, ethernet_connected()) .Times(1) .WillRepeatedly((Return(false))) .RetiresOnSaturation(); - EXPECT_CALL(*mock_network_library_, wifi_network()) - .Times(1) - .WillRepeatedly((ReturnRef(wifi_network_))) - .RetiresOnSaturation(); - EXPECT_CALL(*mock_network_library_, cellular_networks()) + EXPECT_CALL(*mock_network_library_, ethernet_connecting()) .Times(1) - .WillRepeatedly((ReturnRef(cellular_networks_))) + .WillRepeatedly((Return(false))) .RetiresOnSaturation(); - EXPECT_CALL(*mock_network_library_, cellular_network()) + EXPECT_CALL(*mock_network_library_, wifi_available()) .Times(1) - .WillRepeatedly((ReturnRef(cellular_network_))) + .WillRepeatedly((Return(false))) .RetiresOnSaturation(); EXPECT_CALL(*mock_network_library_, cellular_available()) .Times(1) |