Move KeyIdentifier->KeyEvent conversion to src/ui/.

ui/base/events/key_identifier_conversion.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/key_identifier_conversion_views.h"
+#include "ui/base/events/key_identifier_conversion.h"
 
 #include <string.h>
-
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
-#include "base/logging.h"
-#include "content/public/browser/browser_thread.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
-using content::BrowserThread;
-
 namespace {
 
 static const int kNumIdentifierTypes = 3;

[sadrul, 2013/04/15 02:05:12]

We typically don't mark things 'static' in anonymous namespace.

[bryeung, 2013/04/15 15:34:13]

Fixed (throughout).

 
 typedef struct KeyIdentifier {
   // In order: key identifier, character and unicode codepoint.  They are
   // searched in that order as well.
   // These are all placed into a single array as they are treated uniformly and
   // we never refer to a specific type of identifier.  This reduces code
   // duplication below.
   const char* identifiers[kNumIdentifierTypes];
   const ui::KeyboardCode key_code;
   const int event_flags;
 } KeyIdentifier;
 
 // Taken from Section 6.3.3 here:
 // http://www.w3.org/TR/DOM-Level-3-Events/#keyset-keyidentifiers
-// TODO(bryeung): keycodes could be wrong: I took the keydown code only
+// WARNING: keycodes could be wrong, as they are based soley on keydown
 static const KeyIdentifier kKeyIdentifiers[] = {
   { {"Accept", "", ""}, ui::VKEY_ACCEPT, 0 },
   { {"Add", "", ""}, ui::VKEY_ADD, 0 },
   { {"Again", "", ""}, ui::VKEY_UNKNOWN, 0 },
   { {"AllCandidates", "", ""}, ui::VKEY_UNKNOWN, 0 },
   { {"Alphanumeric", "", ""}, ui::VKEY_UNKNOWN, 0 },
   { {"Alt", "", ""}, ui::VKEY_MENU, 0 },
   { {"AltGraph", "", ""}, ui::VKEY_UNKNOWN, 0 },
   { {"Apps", "", ""}, ui::VKEY_APPS, 0 },
   { {"Attn", "", ""}, ui::VKEY_ATTN, 0 },
@@ skipping 271 matching lines @@
             identifierMaps[j]->insert(
                 IdentifierPair(key.identifiers[j], event));
         DCHECK(result.second);
       }
     }
   }
 }
 
 }  // namespace
 
+namespace ui {
 
 const ui::KeyEvent& KeyEventFromKeyIdentifier(
     const std::string& key_identifier) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  // FIXME: what about races?

[bryeung, 2013/04/14 15:40:16]

Sadrul: do you know what the Right Way (TM) is to do this initialization?

[sadrul, 2013/04/15 02:05:12]

You can keep a static base::PlatformThreadId in InitializeMaps() and initialize
it properly in the first call, and then check for each subsequent call to it.
But is that necessary? Most of the code in ui/ is meant to be called from the UI
thread anyway, so perhaps the caller needs to verify that it is calling this
from the right thread.

[bryeung, 2013/04/15 15:34:13]

Works for me: I'll add a comment about that to the header.

   InitializeMaps();
 
   for (int i = 0; i < kNumIdentifierTypes; ++i) {
     const IdentifierMap& map = *identifierMaps[i];
 
     IdentifierMap::const_iterator iter = map.find(key_identifier);
     if (iter != map.end())
       return *iter->second;
   }
 
   return *kUnknownKeyEvent;
 }
+
+}  // namespace ui