chrome/browser/chromeos/net/onc_utils.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/net/onc_utils.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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.cc ('K') | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/onc_utils.cc

diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc

index febfac22512ffb88eb22b023e187f686991349d2..dae67a29729b35aefc97b1abbe57b36bb695b659 100644

--- a/chrome/browser/chromeos/net/onc_utils.cc

+++ b/chrome/browser/chromeos/net/onc_utils.cc

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

#include "base/logging.h"

#include "base/prefs/pref_service.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/ui_proxy_config.h"

#include "chrome/browser/prefs/proxy_config_dictionary.h"

#include "chrome/common/pref_names.h"

@@ -26,6 +25,7 @@

#include "chromeos/network/onc/onc_translator.h"

#include "chromeos/network/onc/onc_utils.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "net/base/host_port_pair.h"

#include "net/proxy/proxy_bypass_rules.h"

#include "net/proxy/proxy_server.h"

@@ -266,7 +266,8 @@ void ImportNetworksForUser(const user_manager::User* user,

const base::DictionaryValue* FindPolicyForActiveUser(

const std::string& guid,

::onc::ONCSource* onc_source) {

- const user_manager::User* user = UserManager::Get()->GetActiveUser();

+ const user_manager::User* user =

+ user_manager::UserManager::Get()->GetActiveUser();

std::string username_hash = user ? user->username_hash() : std::string();

return NetworkHandler::Get()->managed_network_configuration_handler()->

FindPolicyByGUID(username_hash, guid, onc_source);

@@ -275,7 +276,8 @@ const base::DictionaryValue* FindPolicyForActiveUser(

const base::DictionaryValue* GetGlobalConfigFromPolicy(bool for_active_user) {

std::string username_hash;

if (for_active_user) {

- const user_manager::User* user = UserManager::Get()->GetActiveUser();

+ const user_manager::User* user =

+ user_manager::UserManager::Get()->GetActiveUser();

if (!user) {

LOG(ERROR) << "No user logged in yet.";

return NULL;