chrome/browser/chrome_browser_main.cc - Issue 366373002: [Variations] Bring variations_http_header_provider to variations component

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 366373002: [Variations] Bring variations_http_header_provider to variations component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix BUILD.gn 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

« no previous file with comments | « chrome/browser/autocomplete/zero_suggest_provider.cc ('k') | chrome/browser/metrics/variations/proto/BUILD.gn » ('j') | components/variations.gypi » ('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 7fa0378a9881449b9dd305f52fb1a6e33beb6aa3..42f2e7bde04f318da9ed8f6f819a4da412de0162 100644

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

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

@@ -61,7 +61,6 @@

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

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

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

-#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/net/chrome_net_log.h"

@@ -113,6 +112,7 @@

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

#include "components/startup_metric_utils/startup_metric_utils.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"

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

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

@@ -589,8 +589,8 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {

if (command_line->HasSwitch(switches::kForceVariationIds)) {

// Create default variation ids which will always be included in the

// X-Client-Data request header.

- chrome_variations::VariationsHttpHeaderProvider* provider =

- chrome_variations::VariationsHttpHeaderProvider::GetInstance();

+ variations::VariationsHttpHeaderProvider* provider =

+ variations::VariationsHttpHeaderProvider::GetInstance();

bool result = provider->SetDefaultVariationIds(

command_line->GetSwitchValueASCII(switches::kForceVariationIds));

CHECK(result) << "Invalid --" << switches::kForceVariationIds

« no previous file with comments | « chrome/browser/autocomplete/zero_suggest_provider.cc ('k') | chrome/browser/metrics/variations/proto/BUILD.gn » ('j') | components/variations.gypi » ('J')