diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 00:59:50 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 00:59:50 +0000 |
| commit | 7e778b6fae741045e60074d60514d0372576e156 (patch) | |
| tree | 41ea7eb97448920289c1d2e49833b64222087c57 /chrome/browser/chromeos/cros/network_library.cc | |
| parent | 96fa304a3c62935792cb42c17cf8544d73091543 (diff) | |
| download | chromium_src-7e778b6fae741045e60074d60514d0372576e156.zip chromium_src-7e778b6fae741045e60074d60514d0372576e156.tar.gz chromium_src-7e778b6fae741045e60074d60514d0372576e156.tar.bz2 | |
Replace NetworkMessageObserver with Ash code using NetworkStateHandler
Note: Depends on https://chromiumcodereview.appspot.com/12726002/
BUG=164236
For ash.gyp and shelf_layout_manager_unittest:
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12440012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index f20abda..91da9a0 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -18,7 +18,9 @@ #include "chrome/browser/chromeos/cros/network_library_impl_stub.h" #include "chrome/common/net/x509_certificate_model.h" #include "chromeos/network/cros_network_functions.h" +#include "chromeos/network/network_state_handler.h" #include "content/public/browser/browser_thread.h" +#include "grit/ash_strings.h" #include "grit/generated_resources.h" #include "net/base/url_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -444,6 +446,13 @@ void Network::AttemptConnection(const base::Closure& closure) { closure.Run(); } +void Network::set_connecting() { + state_ = STATE_CONNECT_REQUESTED; + // Set the connecting network in NetworkStateHandler for the status area UI. + if (NetworkStateHandler::IsInitialized()) + NetworkStateHandler::Get()->set_connecting_network(service_path()); +} + void Network::SetProfilePath(const std::string& profile_path) { VLOG(1) << "Setting profile for: " << name_ << " to: " << profile_path; SetOrClearStringProperty( |