chrome/browser/chromeos/status/network_menu.cc - Issue 693493003: Revert "Move network_connect code to ui/chromeos/network"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « chrome/browser/chromeos/status/data_promo_notification.cc ('k') | chrome/browser/ui/ash/network_connect_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c814ead4b08ed36d0d3950ce424a55191617cff4..f9fb0d3da85da8c18b7eb878b8a0b8dbb966aff1 100644

--- a/chrome/browser/chromeos/status/network_menu.cc

+++ b/chrome/browser/chromeos/status/network_menu.cc

@@ -9,6 +9,7 @@

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "ash/strings/grit/ash_strings.h"

+#include "ash/system/chromeos/network/network_connect.h"

#include "base/bind.h"

#include "base/logging.h"

#include "base/strings/stringprintf.h"

@@ -28,7 +29,6 @@

#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"

@@ -61,7 +61,7 @@ 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);

+ ash::NetworkConnect::Get()->SetTechnologyEnabled(technology, !is_enabled);

}

} // namespace

@@ -217,7 +217,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);

+ ash::NetworkConnect::Get()->ConnectToNetwork(service_path);

}

////////////////////////////////////////////////////////////////////////////////