chrome/browser/chrome_browser_field_trials_desktop.cc - Issue 18615010: Refactor utility methods out of the ProfileManager

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/chrome_browser_field_trials_desktop.cc

Issue 18615010: Refactor utility methods out of the ProfileManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unbreak rebase and added new static fn from trunk Created 7 years, 5 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/chrome_browser_field_trials_desktop.cc

diff --git a/chrome/browser/chrome_browser_field_trials_desktop.cc b/chrome/browser/chrome_browser_field_trials_desktop.cc

index 6ded51270444dca5d8ca4e0bd7e21e97e7444f8d..339ee6b65497c1c160038424199c6d2d0c586232 100644

--- a/chrome/browser/chrome_browser_field_trials_desktop.cc

+++ b/chrome/browser/chrome_browser_field_trials_desktop.cc

@@ -17,7 +17,7 @@

#include "chrome/browser/gpu/chrome_gpu_util.h"

#include "chrome/browser/omnibox/omnibox_field_trial.h"

#include "chrome/browser/prerender/prerender_field_trial.h"

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

+#include "chrome/browser/profiles/profiles_state.h"

#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"

#include "chrome/browser/ui/sync/one_click_signin_helper.h"

#include "chrome/common/chrome_switches.h"

@@ -78,7 +78,7 @@ void DisableShowProfileSwitcherTrialIfNecessary() {

avatar_menu_always_hidden = true;

#endif

base::FieldTrial* trial = base::FieldTrialList::Find("ShowProfileSwitcher");

- if (trial && (!ProfileManager::IsMultipleProfilesEnabled() ||

+ if (trial && (!profiles::IsMultipleProfilesEnabled() ||

avatar_menu_always_hidden)) {

trial->Disable();

}