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

Unified Diff: chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc

Issue 8588006: Eliminate CrosLibrary::EnsureLoaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_list.cc ('k') | chrome/browser/ui/webui/chromeos/register_page_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
index cd73de77d3f1e5959311c68255f67b0f744381ed..7294f2c49b13e67c2e21eb8a8bc6086ebb9e1ebb 100644
--- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
@@ -99,9 +99,6 @@ class ChooseMobileNetworkHandler
ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
: is_page_ready_(false), has_pending_results_(false) {
- if (!CrosLibrary::Get()->EnsureLoaded())
- return;
-
NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
if (const NetworkDevice* cellular = cros->FindCellularDevice()) {
device_path_ = cellular->device_path();
@@ -174,9 +171,6 @@ void ChooseMobileNetworkHandler::HandleCancel(const ListValue* args) {
return;
}
- if (!CrosLibrary::Get()->EnsureLoaded())
- return;
-
// Switch to automatic mode.
NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
cros->RequestCellularRegister(std::string());
@@ -191,9 +185,6 @@ void ChooseMobileNetworkHandler::HandleConnect(const ListValue* args) {
return;
}
- if (!CrosLibrary::Get()->EnsureLoaded())
- return;
-
NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
cros->RequestCellularRegister(network_id);
}
« no previous file with comments | « chrome/browser/ui/browser_list.cc ('k') | chrome/browser/ui/webui/chromeos/register_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698