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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 2434683003: Move NetworkStateNotifier and NetworkConnect from src/ui (Closed)
Patch Set: Created 4 years, 2 months 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
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 9f326b4eb53cec5608214e1ccbc7499d832e1d25..7a698a6760f297ee37f649e44f5e071257e9bb4e 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -22,13 +22,13 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/network/device_state.h"
+#include "chromeos/network/network_connect.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/chromeos/network/network_connect.h"
#include "ui/chromeos/network/network_icon.h"
#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
#include "ui/gfx/image/image_skia.h"
@@ -64,7 +64,8 @@ bool ShouldHighlightNetwork(const NetworkState* network) {
void ToggleTechnology(const NetworkTypePattern& technology) {
NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
bool is_enabled = handler->IsTechnologyEnabled(technology);
- ui::NetworkConnect::Get()->SetTechnologyEnabled(technology, !is_enabled);
+ chromeos::NetworkConnect::Get()->SetTechnologyEnabled(technology,
+ !is_enabled);
}
} // namespace
@@ -218,7 +219,7 @@ class MainMenuModel : public NetworkMenuModel {
void NetworkMenuModel::ConnectToNetworkAt(int index) {
const std::string& service_path = menu_items_[index].service_path;
- ui::NetworkConnect::Get()->ConnectToNetwork(service_path);
+ chromeos::NetworkConnect::Get()->ConnectToNetwork(service_path);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698