chrome/browser/chromeos/options/network_config_view.cc - Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

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/options/network_config_view.cc

Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-add-supervised-user

Patch Set: Created 4 years, 11 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/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc ('K') | « chrome/browser/chromeos/login/wizard_controller_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | chrome/browser/chromeos/system/device_disabling_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/options/network_config_view.cc

diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc

index a5587f4a0ed6fd32f1c4f4b4425422fa2d2b0c5b..e53234436810c5d06cae3b74a7e557e39f349c1d 100644

--- a/chrome/browser/chromeos/options/network_config_view.cc

+++ b/chrome/browser/chromeos/options/network_config_view.cc

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

#include "ash/shell.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

+#include "chrome/browser/chromeos/login/ui/login_display_host.h"

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

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

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

@@ -43,8 +43,8 @@ using views::Widget;

namespace {

gfx::NativeWindow GetParentForUnhostedDialog() {

- if (chromeos::LoginDisplayHostImpl::default_host()) {

- return chromeos::LoginDisplayHostImpl::default_host()->GetNativeWindow();

+ if (chromeos::LoginDisplayHost::default_host()) {

achuithb 2016/01/21 23:14:31 move the anon namespace to within chromeos namespa

jdufault 2016/01/22 21:14:11 Done.

+ return chromeos::LoginDisplayHost::default_host()->GetNativeWindow();

} else {

Browser* browser = chrome::FindTabbedBrowser(

ProfileManager::GetPrimaryUserProfile(),