[Android DomKey] Swap mapping for TVInputComposite and TVInputComponent

ui/events/keycodes/keyboard_code_conversion_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 
 #include <android/keycodes.h>
 
 namespace ui {
 namespace {
@@ skipping 316 matching lines @@
       return DomKey::TV_ANTENNA_CABLE;
     case AKEYCODE_TV_INPUT_HDMI_1:
       return DomKey::TV_INPUT_HDMI1;
     case AKEYCODE_TV_INPUT_HDMI_2:
       return DomKey::TV_INPUT_HDMI2;
     case AKEYCODE_TV_INPUT_HDMI_3:
       return DomKey::TV_INPUT_HDMI3;
     case AKEYCODE_TV_INPUT_HDMI_4:
       return DomKey::TV_INPUT_HDMI4;
     case AKEYCODE_TV_INPUT_COMPOSITE_1:
+      return DomKey::TV_INPUT_COMPOSITE1;
+    case AKEYCODE_TV_INPUT_COMPOSITE_2:
+      return DomKey::TV_INPUT_COMPOSITE2;
+    case AKEYCODE_TV_INPUT_COMPONENT_1:

[garykac, 2017/01/10 21:33:25]

Could you fix these to be in alphabetical order?

[chongz, 2017/01/10 22:21:36]

It seems to me that this table is in AKEYCODE value order, e.g.
```
AKEYCODE_TV_INPUT_HDMI_4 = 246
AKEYCODE_TV_INPUT_COMPOSITE_1 = 247
AKEYCODE_TV_INPUT_COMPOSITE_2 = 248
AKEYCODE_TV_INPUT_COMPONENT_1 = 249
AKEYCODE_TV_INPUT_COMPONENT_2 = 250
AKEYCODE_TV_INPUT_VGA_1 = 251
AKEYCODE_TV_AUDIO_DESCRIPTION = 252
```

Or do you want me to reorder the whole table?

       return DomKey::TV_INPUT_COMPONENT1;
-    case AKEYCODE_TV_INPUT_COMPOSITE_2:
+    case AKEYCODE_TV_INPUT_COMPONENT_2:
       return DomKey::TV_INPUT_COMPONENT2;
-    case AKEYCODE_TV_INPUT_COMPONENT_1:
-      return DomKey::TV_INPUT_COMPOSITE1;
-    case AKEYCODE_TV_INPUT_COMPONENT_2:
-      return DomKey::TV_INPUT_COMPOSITE2;
     case AKEYCODE_TV_INPUT_VGA_1:
       return DomKey::TV_INPUT_VGA1;
     case AKEYCODE_TV_AUDIO_DESCRIPTION:
       return DomKey::TV_AUDIO_DESCRIPTION;
     case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP:
       return DomKey::TV_AUDIO_DESCRIPTION_MIX_UP;
     case AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN:
       return DomKey::TV_AUDIO_DESCRIPTION_MIX_DOWN;
     case AKEYCODE_TV_ZOOM_MODE:
       return DomKey::ZOOM_TOGGLE;
@@ skipping 415 matching lines @@
     case AKEYCODE_CHANNEL_UP:
       return VKEY_PRIOR;
     case AKEYCODE_CHANNEL_DOWN:
       return VKEY_NEXT;
     default:
       return VKEY_UNKNOWN;
   }
 }
 
 }  // namespace ui