diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 14:14:04 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 14:14:04 +0000 |
| commit | eafb5d14e14b7ef3b3fd57d882c41189950f8d4c (patch) | |
| tree | f635ff2cca05ef3445fe247a363c59b79c81aad7 /rlz/lib | |
| parent | d85f2d9363429ec16491e06170419e02977ea2bb (diff) | |
| download | chromium_src-eafb5d14e14b7ef3b3fd57d882c41189950f8d4c.zip chromium_src-eafb5d14e14b7ef3b3fd57d882c41189950f8d4c.tar.gz chromium_src-eafb5d14e14b7ef3b3fd57d882c41189950f8d4c.tar.bz2 | |
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
Diffstat (limited to 'rlz/lib')
| -rw-r--r-- | rlz/lib/lib_values.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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"; |