Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 10108026: Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA enabled. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: merge to tot Created 8 years, 8 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/profiles/profile_io_data.h ('k') | chrome/browser/protector/protector_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 38401252ba492750dcacb32add0bd7f50b70bd1b..95cf1bdfb2bdeb98bce14169a888dda3c9f576a0 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -160,7 +160,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
scoped_ptr<ProfileParams> params(new ProfileParams);
params->path = profile->GetPath();
- params->is_incognito = profile->IsOffTheRecord();
params->clear_local_state_on_exit =
pref_service->GetBoolean(prefs::kClearSiteDataOnExit);
@@ -247,8 +246,7 @@ void ProfileIOData::AppRequestContext::SetHttpTransactionFactory(
ProfileIOData::AppRequestContext::~AppRequestContext() {}
ProfileIOData::ProfileParams::ProfileParams()
- : is_incognito(false),
- clear_local_state_on_exit(false),
+ : clear_local_state_on_exit(false),
io_thread(NULL),
#if defined(ENABLE_NOTIFICATIONS)
notification_service(NULL),
@@ -262,7 +260,8 @@ ProfileIOData::ProfileIOData(bool is_incognito)
: initialized_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(
resource_context_(new ResourceContext(this))),
- initialized_on_UI_thread_(false) {
+ initialized_on_UI_thread_(false),
+ is_incognito_(is_incognito) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
@@ -465,7 +464,7 @@ void ProfileIOData::LazyInitialize() const {
transport_security_persister_.reset(
new TransportSecurityPersister(transport_security_state_.get(),
profile_params_->path,
- profile_params_->is_incognito));
+ is_incognito()));
// NOTE(willchan): Keep these protocol handlers in sync with
// ProfileIOData::IsHandledProtocol().
@@ -477,7 +476,7 @@ void ProfileIOData::LazyInitialize() const {
}
bool set_protocol = job_factory_->SetProtocolHandler(
chrome::kExtensionScheme,
- CreateExtensionProtocolHandler(profile_params_->is_incognito,
+ CreateExtensionProtocolHandler(is_incognito(),
profile_params_->extension_info_map));
DCHECK(set_protocol);
set_protocol = job_factory_->SetProtocolHandler(
@@ -515,7 +514,7 @@ void ProfileIOData::LazyInitialize() const {
void ProfileIOData::ApplyProfileParamsToContext(
ChromeURLRequestContext* context) const {
- context->set_is_incognito(profile_params_->is_incognito);
+ context->set_is_incognito(is_incognito());
context->set_accept_language(profile_params_->accept_language);
context->set_accept_charset(profile_params_->accept_charset);
context->set_referrer_charset(profile_params_->referrer_charset);
@@ -525,6 +524,7 @@ void ProfileIOData::ApplyProfileParamsToContext(
void ProfileIOData::ShutdownOnUIThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
enable_referrers_.Destroy();
+ enable_metrics_.Destroy();
clear_local_state_on_exit_.Destroy();
safe_browsing_enabled_.Destroy();
session_startup_pref_.Destroy();
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/protector/protector_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698