chrome/browser/chrome_browser_main.cc - Issue 118583003: gyps! and builds!

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 118583003: gyps! and builds! Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 9e87a91609aea1d9b5b8d2710901a717b899f853..7ae4d2b88948011135a0f5207c7c8511f252089b 100644

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

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

@@ -62,7 +62,6 @@

#include "chrome/browser/metrics/thread_watcher.h"

#include "chrome/browser/metrics/tracking_synchronizer.h"

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

-#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.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"

@@ -105,7 +104,6 @@

#include "components/google/core/browser/google_util.h"

#include "components/language_usage_metrics/language_usage_metrics.h"

#include "components/metrics/metrics_service.h"

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

#include "components/rappor/rappor_service.h"

#include "components/signin/core/common/profile_management_switches.h"

#include "components/startup_metric_utils/startup_metric_utils.h"

@@ -184,6 +182,8 @@

#endif

#if !defined(DISABLE_NACL)

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

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

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

#endif

« no previous file with comments | « build/gyp_chromium ('k') | content/app/android/child_process_service.h » ('j') | no next file with comments »