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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 12263007: Fixed CaptivePortal UMA histogram names to be consistent with XML description. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed Captive Portal UMA histogram names. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 if (!detector || !network) 195 if (!detector || !network)
196 return NetworkPortalDetector::CaptivePortalState(); 196 return NetworkPortalDetector::CaptivePortalState();
197 return detector->GetCaptivePortalState(network); 197 return detector->GetCaptivePortalState(network);
198 } 198 }
199 199
200 void RecordDiscrepancyWithShill( 200 void RecordDiscrepancyWithShill(
201 const Network* network, 201 const Network* network,
202 const NetworkPortalDetector::CaptivePortalStatus status) { 202 const NetworkPortalDetector::CaptivePortalStatus status) {
203 if (network->online()) { 203 if (network->online()) {
204 UMA_HISTOGRAM_ENUMERATION( 204 UMA_HISTOGRAM_ENUMERATION(
205 "CaptivePortal.OOBE.DiscrepancyWithShill.Online", 205 "CaptivePortal.OOBE.DiscrepancyWithShill_Online",
206 status, 206 status,
207 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT); 207 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT);
208 } else if (network->restricted_pool()) { 208 } else if (network->restricted_pool()) {
209 UMA_HISTOGRAM_ENUMERATION( 209 UMA_HISTOGRAM_ENUMERATION(
210 "CaptivePortal.OOBE.DiscrepancyWithShill.RestrictedPool", 210 "CaptivePortal.OOBE.DiscrepancyWithShill_RestrictedPool",
211 status, 211 status,
212 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT); 212 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT);
213 } else { 213 } else {
214 UMA_HISTOGRAM_ENUMERATION( 214 UMA_HISTOGRAM_ENUMERATION(
215 "CaptivePortal.OOBE.DiscrepancyWithShill.Offline", 215 "CaptivePortal.OOBE.DiscrepancyWithShill_Offline",
216 status, 216 status,
217 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT); 217 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT);
218 } 218 }
219 } 219 }
220 220
221 // Record state and descripancies with shill (e.g. shill thinks that 221 // Record state and descripancies with shill (e.g. shill thinks that
222 // network is online but NetworkPortalDetector claims that it's behind 222 // network is online but NetworkPortalDetector claims that it's behind
223 // portal) for the network identified by |service_path|. 223 // portal) for the network identified by |service_path|.
224 void RecordNetworkPortalDetectorStats(const std::string& service_path) { 224 void RecordNetworkPortalDetectorStats(const std::string& service_path) {
225 const Network* network = FindNetworkByPath(service_path); 225 const Network* network = FindNetworkByPath(service_path);
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1737 if (!cros_settings) 1737 if (!cros_settings)
1738 return false; 1738 return false;
1739 1739
1740 // Offline login is allowed only when user pods are hidden. 1740 // Offline login is allowed only when user pods are hidden.
1741 bool show_pods; 1741 bool show_pods;
1742 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); 1742 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
1743 return !show_pods; 1743 return !show_pods;
1744 } 1744 }
1745 1745
1746 } // namespace chromeos 1746 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698