chrome/browser/chrome_browser_main.cc - Issue 277463003: Use a proper profile in NaClBrowserDelegateImpl::MapUrlToLocalFilePath

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 277463003: Use a proper profile in NaClBrowserDelegateImpl::MapUrlToLocalFilePath (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git cl format Created 6 years, 7 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

Index: chrome/browser/chrome_browser_main.cc

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

index d84585d1cdef1629afad49d2ab019c8f900cff10..66ec527391a77322151e086e3cad5f257148f89b 100644

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

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

@@ -125,7 +125,6 @@

#include "content/public/common/content_switches.h"

#include "content/public/common/main_function_params.h"

#include "extensions/browser/extension_protocols.h"

-#include "extensions/browser/extension_system.h"

#include "grit/app_locale_settings.h"

#include "grit/browser_resources.h"

#include "grit/chromium_strings.h"

@@ -1256,8 +1255,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {

// NaClBrowserDelegateImpl is accessed inside PostProfileInit().

// So make sure to create it before that.

#if !defined(DISABLE_NACL)

- NaClBrowserDelegateImpl* delegate = new NaClBrowserDelegateImpl(

- extensions::ExtensionSystem::Get(profile_)->info_map());

+ NaClBrowserDelegateImpl* delegate =

+ new NaClBrowserDelegateImpl(browser_process_->profile_manager());

nacl::NaClBrowser::SetDelegate(delegate);

#endif

« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.h » ('j') | no next file with comments »