chrome/browser/chrome_browser_main.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_main.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_main.cc

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

index 5877511b38980397c26a077bd5d53b21c727b867..2ad2c2763d4b8c6f7e6c229564ec7e158e9b0db8 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

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

#include "chrome/browser/process_singleton.h"

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

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

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

#include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"

#include "chrome/browser/search_engines/search_engine_type.h"

#include "chrome/browser/service/service_process_control.h"

@@ -329,7 +330,7 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters,

const base::FilePath& user_data_dir,

const CommandLine& parsed_command_line) {

TRACE_EVENT0("startup", "ChromeBrowserMainParts::CreateProfile")

- if (ProfileManager::IsMultipleProfilesEnabled() &&

+ if (profiles::IsMultipleProfilesEnabled() &&

parsed_command_line.HasSwitch(switches::kProfileDirectory)) {

g_browser_process->local_state()->SetString(prefs::kProfileLastUsed,

parsed_command_line.GetSwitchValueASCII(switches::kProfileDirectory));