chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.cc

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

Patch Set: rebase 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:

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

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

index 531952ecab655c7044bc120379e1a04836c9766c..c3ad9795c2198daa8f9ceadf251cd91c2a5ddc35 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -52,7 +52,7 @@

#include "ui/base/l10n/l10n_util.h"

#if defined(OS_CHROMEOS)

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

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

#endif

using base::UserMetricsAction;

@@ -1316,7 +1316,7 @@ void ContentSettingsHandler::SetContentFilter(const base::ListValue* args) {

#if defined(OS_CHROMEOS)

// ChromeOS special case : in Guest mode settings are opened in Incognito

// mode, so we need original profile to actually modify settings.

- if (chromeos::UserManager::Get()->IsLoggedInAsGuest())

+ if (user_manager::UserManager::Get()->IsLoggedInAsGuest())

profile = profile->GetOriginalProfile();

#endif