Index: chrome/browser/chromeos/cros_network_library.cc |
=================================================================== |
--- chrome/browser/chromeos/cros_network_library.cc (revision 30037) |
+++ chrome/browser/chromeos/cros_network_library.cc (working copy) |
@@ -20,13 +20,12 @@ |
}; |
CrosNetworkLibrary::CrosNetworkLibrary() { |
- if (CrosLibrary::loaded()) { |
- MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::FILE); |
- if (loop) { |
- loop->PostTask(FROM_HERE, NewRunnableMethod(this, |
- &CrosNetworkLibrary::InitOnBackgroundThread)); |
- } |
- } |
+ if (!CrosLibrary::loaded()) |
+ return; |
+ |
+ ChromeThread::PostTask( |
+ ChromeThread::FILE, FROM_HERE, |
+ NewRunnableMethod(this, &CrosNetworkLibrary::InitOnBackgroundThread)); |
} |
CrosNetworkLibrary::~CrosNetworkLibrary() { |
@@ -71,15 +70,16 @@ |
void CrosNetworkLibrary::ConnectToWifiNetwork(WifiNetwork network, |
const string16& password) { |
- if (CrosLibrary::loaded()) { |
- MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::FILE); |
- if (loop) |
- loop->PostTask(FROM_HERE, NewRunnableFunction( |
+ if (!CrosLibrary::loaded()) |
+ return; |
+ |
+ ChromeThread::PostTask( |
+ ChromeThread::FILE, FROM_HERE, |
+ NewRunnableFunction( |
&chromeos::ConnectToWifiNetwork, |
network.ssid.c_str(), |
password.empty() ? NULL : UTF16ToUTF8(password).c_str(), |
GetEncryptionString(network.encryption))); |
- } |
} |
// static |
@@ -139,11 +139,11 @@ |
const WifiNetworkVector& networks, bool ethernet_connected) { |
// Make sure we run on UI thread. |
if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) { |
- MessageLoop* loop = ChromeThread::GetMessageLoop(ChromeThread::UI); |
- if (loop) |
- loop->PostTask(FROM_HERE, NewRunnableMethod(this, |
- &CrosNetworkLibrary::UpdateNetworkStatus, networks, |
- ethernet_connected)); |
+ ChromeThread::PostTask( |
+ ChromeThread::UI, FROM_HERE, |
+ NewRunnableMethod(this, |
+ &CrosNetworkLibrary::UpdateNetworkStatus, networks, |
+ ethernet_connected)); |
return; |
} |