chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 2434683003: Move NetworkStateNotifier and NetworkConnect from src/ui

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/ui/webui/options/chromeos/internet_options_handler.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

« chrome/browser/chromeos/options/vpn_config_view.cc ('K') | « chrome/browser/ui/ash/vpn_delegate_chromeos.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/network/network_connect.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

index 1bf90c7cc2dc91929a9ea0f84ec1c41b3b71cda1..0a8e218e71d684319eafbd404a1fde704ecadbae 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -27,6 +27,7 @@

#include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h"

#include "chromeos/login/login_state.h"

#include "chromeos/network/managed_network_configuration_handler.h"

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

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

#include "components/onc/onc_constants.h"

@@ -37,7 +38,6 @@

#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"

#include "third_party/cros_system_api/dbus/service_constants.h"

#include "ui/base/webui/web_ui_util.h"

-#include "ui/chromeos/network/network_connect.h"

namespace chromeos {

namespace options {

@@ -149,7 +149,7 @@ void InternetOptionsHandler::ShowMorePlanInfoCallback(

}

std::string service_path = ServicePathFromGuid(guid);

if (!service_path.empty())

- ui::NetworkConnect::Get()->ShowMobileSetup(service_path);

+ chromeos::NetworkConnect::Get()->ShowMobileSetup(service_path);

}

void InternetOptionsHandler::SimOperationCallback(const base::ListValue* args) {

« chrome/browser/chromeos/options/vpn_config_view.cc ('K') | « chrome/browser/ui/ash/vpn_delegate_chromeos.cc ('k') | chromeos/chromeos.gyp » ('j') | chromeos/network/network_connect.h » ('J')