Eliminate CrosLibrary::EnsureLoaded

chrome/browser/ui/webui/chromeos/register_page_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 44 matching lines @@
 
 // Utility function that returns string corresponding to currently active
 // connection type |kConnectionEthernet|kConnectionWifi|kConnection3g|.
 // If multiple interfaces are connected, result is based on the
 // priority Ethernet-Wifi-Cellular.
 // If there's no interface that's connected, interface that's in connecting
 // state is considered as the active one.
 // Otherwise |kUndefinedValue| is returned.
 #if defined(OS_CHROMEOS)
 static std::string GetConnectionType() {
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-    LOG(ERROR) << "CrosLibrary is not loaded.";
-    return kUndefinedValue;
-  }
-
   chromeos::NetworkLibrary* network_lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (network_lib->ethernet_connected())
     return kConnectionEthernet;
   else if (network_lib->wifi_connected())
     return kConnectionWifi;
   else if (network_lib->cellular_connected())
     return kConnection3g;
   // Connection might have been lost and is in reconnecting state at this point.
   else if (network_lib->ethernet_connecting())
@@ skipping 150 matching lines @@
     StringValue url_value(url);
     web_ui_->CallJavascriptFunction(kJsApiSetRegistrationUrl, url_value);
   } else {
     SkipRegistration("Startup manifest not defined.");
   }
 #endif
 }
 
 void RegisterPageHandler::HandleGetUserInfo(const ListValue* args) {
 #if defined(OS_CHROMEOS)
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
+  if (chromeos::CrosLibrary::Get()->libcros_loaded()) {

[satorux1, 2011/11/16 23:51:34]

IsRunningOnChromeOS()?

[stevenjb, 2011/11/17 00:23:33]

Done.

      version_loader_.GetVersion(
          &version_consumer_,
          base::Bind(&RegisterPageHandler::OnVersion, base::Unretained(this)),
          chromeos::VersionLoader::VERSION_FULL);
   } else {
     SkipRegistration("CrosLibrary is not loaded.");

[satorux1, 2011/11/16 23:51:34]

"Not running on Chrome OS" ?

[stevenjb, 2011/11/17 00:23:33]

Done.

   }
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 void RegisterPageHandler::OnVersion(chromeos::VersionLoader::Handle handle,
                                     std::string version) {
   version_ = version;
   SendUserInfo();
 }
@@ skipping 51 matching lines @@
 RegisterPageUI::RegisterPageUI(TabContents* contents) : ChromeWebUI(contents) {
   RegisterPageHandler* handler = new RegisterPageHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
   RegisterPageUIHTMLSource* html_source = new RegisterPageUIHTMLSource();
 
   // Set up the chrome://register/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }