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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 886523003: Add a Rappor option in the settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 544 }
545 if (!username.empty()) 545 if (!username.empty())
546 username = gaia::SanitizeEmail(gaia::CanonicalizeEmail(username)); 546 username = gaia::SanitizeEmail(gaia::CanonicalizeEmail(username));
547 547
548 values->SetString("username", username); 548 values->SetString("username", username);
549 #endif 549 #endif
550 // Pass along sync status early so it will be available during page init. 550 // Pass along sync status early so it will be available during page init.
551 values->Set("syncData", GetSyncStateDictionary().release()); 551 values->Set("syncData", GetSyncStateDictionary().release());
552 552
553 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL); 553 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
554
555 base::string16 rappor_url = base::ASCIIToUTF16(chrome::kRapporLearnMoreURL);
556 values->SetString("enableRappor",
557 l10n_util::GetStringFUTF16(IDS_OPTIONS_ENABLE_RAPPOR, rappor_url));
554 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL); 558 values->SetString("doNotTrackLearnMoreURL", chrome::kDoNotTrackLearnMoreURL);
555 559
556 #if !defined(OS_CHROMEOS) 560 #if !defined(OS_CHROMEOS)
557 values->SetBoolean("metricsReportingEnabledAtStart", 561 values->SetBoolean("metricsReportingEnabledAtStart",
558 ChromeMetricsServiceAccessor::IsMetricsReportingEnabled()); 562 ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
559 #endif 563 #endif
560 564
561 #if defined(OS_CHROMEOS) 565 #if defined(OS_CHROMEOS)
562 // TODO(pastarmovj): replace this with a call to the CrosSettings list 566 // TODO(pastarmovj): replace this with a call to the CrosSettings list
563 // handling functionality to come. 567 // handling functionality to come.
(...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
2117 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2121 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2118 const policy::PolicyMap& previous, 2122 const policy::PolicyMap& previous,
2119 const policy::PolicyMap& current) { 2123 const policy::PolicyMap& current) {
2120 std::set<std::string> different_keys; 2124 std::set<std::string> different_keys;
2121 current.GetDifferingKeys(previous, &different_keys); 2125 current.GetDifferingKeys(previous, &different_keys);
2122 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2126 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2123 SetupMetricsReportingCheckbox(); 2127 SetupMetricsReportingCheckbox();
2124 } 2128 }
2125 2129
2126 } // namespace options 2130 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698