chrome/browser/chrome_browser_main.cc - Issue 75463005: Move more files from chrome/browser/nacl_host/ to components/nacl/browser/

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 75463005: Move more files from chrome/browser/nacl_host/ to components/nacl/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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

« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | components/nacl/browser/nacl_broker_service_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

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

index 10bd8b95c0077c8e517a180c594a86ba4c2e4ec7..6bd6c4f15da636bccce8400130ddad835fae997c 100644

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

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

@@ -72,7 +72,6 @@

#include "chrome/browser/metrics/variations/variations_http_header_provider.h"

#include "chrome/browser/metrics/variations/variations_service.h"

#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"

-#include "chrome/browser/nacl_host/nacl_process_host.h"

#include "chrome/browser/net/chrome_net_log.h"

#include "chrome/browser/net/crl_set_fetcher.h"

#include "chrome/browser/notifications/desktop_notification_service.h"

@@ -115,6 +114,7 @@

#include "chrome/common/profiling.h"

#include "chrome/installer/util/google_update_settings.h"

#include "components/nacl/browser/nacl_browser.h"

+#include "components/nacl/browser/nacl_process_host.h"

#include "components/startup_metric_utils/startup_metric_utils.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_observer.h"

@@ -1497,7 +1497,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {

content::BrowserThread::PostTask(

content::BrowserThread::IO,

FROM_HERE,

- base::Bind(NaClProcessHost::EarlyStartup));

+ base::Bind(nacl::NaClProcessHost::EarlyStartup));

#endif

// Make sure initial prefs are recorded