chrome/browser/chrome_browser_main.cc - Issue 424123003: Replace the use of CLD_DATA_FROM* and CLD-related ifdefs with runtime checks.

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 424123003: Replace the use of CLD_DATA_FROM* and CLD-related ifdefs with runtime checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 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:

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 3d483355f89c4adf8a296836cd56bc8ab7f4d413..8c1a58afd8b7490655b24a893fdae32ca37bdb1d 100644

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

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

@@ -110,6 +110,7 @@

#include "components/rappor/rappor_service.h"

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

#include "components/startup_metric_utils/startup_metric_utils.h"

+#include "components/translate/content/common/cld_data_source.h"

#include "components/translate/core/browser/translate_download_manager.h"

#include "components/variations/variations_http_header_provider.h"

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

@@ -395,9 +396,9 @@ void RegisterComponentsForUpdate() {

g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);

#endif

-#if defined(CLD_DATA_FROM_COMPONENT)

- RegisterCldComponent(cus);

-#endif

+ if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) {

+ RegisterCldComponent(cus);

+ }

base::FilePath path;

if (PathService::Get(chrome::DIR_USER_DATA, &path)) {

« no previous file with comments | « build/common.gypi ('k') | chrome/browser/component_updater/cld_component_installer.cc » ('j') | no next file with comments »