chrome/browser/chrome_content_browser_client.cc - Issue 10968003: Add rendering support to the TestShell.

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_content_browser_client.cc

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed nits, rebased. Created 8 years, 3 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_content_browser_client.cc

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

index cebf14eda25977b3b5118b6ebced9391cd3c979e..150db0ec6b4cd6bd6db179eec45849950e608684 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -851,10 +851,12 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(

if (process) {

Profile* profile = Profile::FromBrowserContext(

process->GetBrowserContext());

- extensions::ProcessMap* process_map =

- profile->GetExtensionService()->process_map();

- if (process_map && process_map->Contains(process->GetID()))

- command_line->AppendSwitch(switches::kExtensionProcess);

+ if (profile->GetExtensionService()) {

+ extensions::ProcessMap* process_map =

+ profile->GetExtensionService()->process_map();

+ if (process_map && process_map->Contains(process->GetID()))

+ command_line->AppendSwitch(switches::kExtensionProcess);

+ }

PrefService* prefs = profile->GetPrefs();

// Currently this pref is only registered if applied via a policy.

« no previous file with comments | « chrome/browser/android/tab_base_android_impl.cc ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »