chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.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/app/chromeos_strings.grdp ('K') | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/mobile/mobile_activator.cc » ('j') | chrome/browser/chromeos/mobile/mobile_activator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 6fd01a40014b7e239c46d458cea2c905f8559487..f067fcd1090f3a22362121e182e0f07c07f28e87 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -59,6 +59,7 @@

#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

+#include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h"

#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"

#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"

#include "chrome/browser/chromeos/options/cert_library.h"

@@ -87,7 +88,6 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/task_manager/task_manager_interface.h"

#include "chrome/browser/ui/ash/ash_util.h"

-#include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"

#include "chrome/common/channel_info.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

@@ -253,7 +253,7 @@ class DBusServices {

// Initialize the NetworkConnect handler.

network_connect_delegate_.reset(new NetworkConnectDelegateChromeOS);

- ui::NetworkConnect::Initialize(network_connect_delegate_.get());

+ chromeos::NetworkConnect::Initialize(network_connect_delegate_.get());

James Cook 2016/10/20 00:11:43 nit: chromeos:: maybe not needed here? (We're in n

stevenjb 2016/10/20 00:57:22 Done.

// Likewise, initialize the upgrade detector for Chrome OS. The upgrade

// detector starts to monitor changes from the update engine.

@@ -269,7 +269,7 @@ class DBusServices {

}

~DBusServices() {

- ui::NetworkConnect::Shutdown();

+ chromeos::NetworkConnect::Shutdown();

network_connect_delegate_.reset();

CertLibrary::Shutdown();

NetworkHandler::Shutdown();