From db6263ce0505b00c880cdff20b0cd0a6fc2e77a9 Mon Sep 17 00:00:00 2001 From: "hshi@chromium.org" Date: Tue, 15 Apr 2014 18:57:28 +0000 Subject: Merge 263952 "Revert 263828 "Do not reserve an access point code..." > Revert 263828 "Do not reserve an access point code for CHROME_IO..." > > > 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/239633002 TBR=hshi@chromium.org Review URL: https://codereview.chromium.org/238063003 git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@263955 0039d316-1c4b-4281-b951-d872f2087c98 --- rlz/lib/lib_values.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'rlz/lib') diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc index 8e79bb3..12bf457 100644 --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc @@ -99,9 +99,7 @@ const char* GetAccessPointName(AccessPoint point) { case CHROMEOS_HOME_PAGE: return "CB"; case CHROMEOS_RESERVED: return "CC"; case CHROME_IOS_OMNIBOX: return "C9"; - // 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 CHROME_IOS_RESERVED: return "C0"; case UNDEFINED_AP_O: return "RO"; case UNDEFINED_AP_P: return "RP"; case UNDEFINED_AP_Q: return "RQ"; -- cgit v1.1