From eafb5d14e14b7ef3b3fd57d882c41189950f8d4c Mon Sep 17 00:00:00 2001 From: "droger@chromium.org" Date: Tue, 15 Apr 2014 14:14:04 +0000 Subject: Merge 263828 "Do not reserve an access point code for CHROME_IOS..." > Do not reserve an access point code for CHROME_IOS_RESERVED > > Access point values need to be coordinated with the team using them. Since > CHROME_IOS_RESERVED is not used, do not reserve an access point for that > enum, and instead assert if it is ever used. > > BUG=360686 > > Review URL: https://codereview.chromium.org/237273002 TBR=sdefresne@chromium.org Review URL: https://codereview.chromium.org/236203013 git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@263837 0039d316-1c4b-4281-b951-d872f2087c98 --- rlz/lib/lib_values.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc index 12bf457..8e79bb3 100644 --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc @@ -99,7 +99,9 @@ const char* GetAccessPointName(AccessPoint point) { case CHROMEOS_HOME_PAGE: return "CB"; case CHROMEOS_RESERVED: return "CC"; case CHROME_IOS_OMNIBOX: return "C9"; - case CHROME_IOS_RESERVED: return "C0"; + // Note: this enumeration does not correspond to a real access point and + // should never be used. Fails back to the default that raises an assert. + case CHROME_IOS_RESERVED: break; case UNDEFINED_AP_O: return "RO"; case UNDEFINED_AP_P: return "RP"; case UNDEFINED_AP_Q: return "RQ"; -- cgit v1.1