Add more useful metrics to "Languages and Input" page in Chrome OS.

Record metrics with associated input method IDs, and language codes,
to make the metrics data more useful.

Update chromeactions.txt as follows:
% cd chrome/tools
% PYTHONPATH=../../tools/python python extract_actions.py  --hash

BUG=chromium-os:2637
TEST=manually.

Review URL: http://codereview.chromium.org/3330021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59348 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 425 insertions, 17 deletions

diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc
index fee33c4..594f8b1 100644
--- a/chrome/browser/chromeos/dom_ui/language_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc
@@ -227,26 +227,26 @@ DictionaryValue* LanguageOptionsHandler::GetUiLanguageCodeSet() {
 
 void LanguageOptionsHandler::InputMethodDisableCallback(
     const ListValue* args) {
-  std::string input_method_id = WideToASCII(ExtractStringValue(args));
-  // TODO(satorux): Record the input method ID code as well.
-  UserMetrics::RecordAction(
-      UserMetricsAction("LanguageOptions_DisableInputMethod"));
+  const std::string input_method_id = WideToASCII(ExtractStringValue(args));
+  const std::string action = StringPrintf(
+      "LanguageOptions_DisableInputMethod_%s", input_method_id.c_str());
+  UserMetrics::RecordComputedAction(action);
 }
 
 void LanguageOptionsHandler::InputMethodEnableCallback(
     const ListValue* args) {
-  std::string input_method_id = WideToASCII(ExtractStringValue(args));
-  // TODO(satorux): Record the input method ID code as well.
-  UserMetrics::RecordAction(
-      UserMetricsAction("LanguageOptions_EnableInputMethod"));
+  const std::string input_method_id = WideToASCII(ExtractStringValue(args));
+  const std::string action = StringPrintf(
+      "LanguageOptions_EnableInputMethod_%s", input_method_id.c_str());
+  UserMetrics::RecordComputedAction(action);
 }
 
 void LanguageOptionsHandler::InputMethodOptionsOpenCallback(
     const ListValue* args) {
-  std::string input_method_id = WideToASCII(ExtractStringValue(args));
-  // TODO(satorux): Record the input method ID code as well.
-  UserMetrics::RecordAction(
-      UserMetricsAction("InputMethodOptions_Open"));
+  const std::string input_method_id = WideToASCII(ExtractStringValue(args));
+  const std::string action = StringPrintf(
+      "InputMethodOptions_Open_%s", input_method_id.c_str());
+  UserMetrics::RecordComputedAction(action);
 }
 
 void LanguageOptionsHandler::LanguageOptionsOpenCallback(
@@ -256,12 +256,12 @@ void LanguageOptionsHandler::LanguageOptionsOpenCallback(
 
 void LanguageOptionsHandler::UiLanguageChangeCallback(
     const ListValue* args) {
-  // TODO(satorux): Record the language code as well.
-  UserMetrics::RecordAction(
-      UserMetricsAction("LanguageOptions_UiLanguageChange"));
-
-  std::string language_code = WideToASCII(ExtractStringValue(args));
+  const std::string language_code = WideToASCII(ExtractStringValue(args));
   CHECK(!language_code.empty());
+  const std::string action = StringPrintf(
+      "LanguageOptions_UiLanguageChange_%s", language_code.c_str());
+  UserMetrics::RecordComputedAction(action);
+
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kApplicationLocale, language_code);
   prefs->SavePersistentPrefs();
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index e00955f..b66c207 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -46,7 +46,10 @@
 0xd31dee084a5166e5	BackMenu_Popup
 0x478e9b82a50ffea5	BackMenu_ShowFullHistory
 0x048733a8c6205d00	BackgroundImageCache
+0x1d145f0af708242c	BlockNonsandboxedPlugins_Disable
+0xd80cc9291c9c82a9	BlockNonsandboxedPlugins_Enable
 0x114c3050111d8b8d	Bold
+0x3012b56b98c28823	BookmarkBarFolder_DragEnd
 0x4213d5e4d5da1c0a	BookmarkBar_ContextMenu_Add
 0x1ce97170a30f2fdd	BookmarkBar_ContextMenu_Edit
 0xbe267767bb380a0d	BookmarkBar_ContextMenu_NewFolder
@@ -60,6 +63,7 @@
 0xa90364ba80763db0	BookmarkBar_ContextMenu_RemoveFromBookmarkBar
 0xa905159308ac6adc	BookmarkBar_ContextMenu_ShowInFolder
 0x8623e5f54147dbe6	BookmarkBar_DragButton
+0x4b37738130b32b3e	BookmarkBar_DragEnd
 0x6c0fc567d362960e	BookmarkBar_DragFromFolder
 0xeec5d4ade759d651	BookmarkBar_DragRecentlyBookmarked
 0x949073bf8996b6c8	BookmarkBar_ShowOtherBookmarks
@@ -88,6 +92,11 @@
 0x511e8366cdda3890	ClearBrowsingData_Passwords
 0x6d69a061f7adf595	ClearBrowsingData_ShowDlg
 0x9fd631c62234969a	ClearSelection
+0xf2c974774a0fd57e	ClickToPlay_AllowAlways
+0x3589e51b0b1bf730	ClickToPlay_Dismiss_Infobar
+0xe1b2d67ea37c5ba0	ClickToPlay_InfobarShown
+0xcfe5a8d495d7df34	ClickToPlay_LoadAll_Bubble
+0xb30dcb1850e21bce	ClickToPlay_LoadAll_Infobar
 0x55c851e7c3d9a792	ClickedBookmarkBarURLButton
 0x4f667771b8f484b1	CloseAllSuppressedPopups
 0x9436ccb9a5cc6a27	CloseTab
@@ -152,8 +161,13 @@
 0x8629faf7b785eeb8	FirstRunDef_Cancel
 0x25a140c5238afc21	FirstRunOEMBubbleView_Clicked
 0xb4c78c7e4227f729	FirstRun_Do_DefBrowser
+0x7ff73528feb7491b	FocusAppMenu
+0x05804843ffe72695	FocusBookmarksToolbar
+0x44c489e30171039c	FocusChromeOSStatus
 0xff4066491e7794bc	FocusLocation
+0x930bb978f3a88be2	FocusNextPane
 0x5e6c303e567af436	FocusPageAndAppMenus
+0x658708a96ac44ccc	FocusPreviousPane
 0x5b7b952796f109ad	FocusSearch
 0xc27e065ab57a01e7	FocusToolbar
 0x12d7f80b419064fa	FontName
@@ -212,6 +226,68 @@
 0x8cf04a9734132302	Home
 0x2679e82f33d66fc0	Import_ShowDlg
 0x497470e76a40fc53	Indent
+0xddbd530e88f0baad	InputMethodOptions_Open_chewing
+0xfe212a1637f75443	InputMethodOptions_Open_hangul
+0x155fe2aa889c6475	InputMethodOptions_Open_m17n:ar:kbd
+0x702d3712351014c9	InputMethodOptions_Open_m17n:fa:isiri
+0xcd3d52a63eb9d19f	InputMethodOptions_Open_m17n:hi:itrans
+0x84a453cc41b70ade	InputMethodOptions_Open_m17n:th:kesmanee
+0x781cb9476ef74fb6	InputMethodOptions_Open_m17n:th:pattachote
+0x7ed4a3c1dbbea563	InputMethodOptions_Open_m17n:th:tis820
+0x515db9088433579e	InputMethodOptions_Open_m17n:vi:tcvn
+0x28585f828d27064e	InputMethodOptions_Open_m17n:vi:telex
+0xaa5bd22b752b2402	InputMethodOptions_Open_m17n:vi:viqr
+0x32caeac9c52a0b3e	InputMethodOptions_Open_m17n:vi:vni
+0x9b5fe154dcfed5fc	InputMethodOptions_Open_m17n:zh:cangjie
+0x4b904484c5ae5ef9	InputMethodOptions_Open_m17n:zh:quick
+0xd760683dc9d7524f	InputMethodOptions_Open_mozc
+0xaf5b5ca01e17f82f	InputMethodOptions_Open_mozc-dv
+0x560b367165104ca0	InputMethodOptions_Open_mozc-jp
+0xfc8099598cc3d1e6	InputMethodOptions_Open_pinyin
+0x08ac76684d7e7d26	InputMethodOptions_Open_xkb:be::fra
+0x850b8ba271d39949	InputMethodOptions_Open_xkb:be::ger
+0x0b947d8e36f5c932	InputMethodOptions_Open_xkb:be::nld
+0x46a87a1ab952dc04	InputMethodOptions_Open_xkb:bg::bul
+0xa46c41e1afe6014b	InputMethodOptions_Open_xkb:bg:phonetic:bul
+0x822bf0422c6827cd	InputMethodOptions_Open_xkb:br::por
+0xabf8d015035007d4	InputMethodOptions_Open_xkb:ca::fra
+0x1c146e1accb26ba1	InputMethodOptions_Open_xkb:ca:eng:eng
+0x1092170d80d1a97e	InputMethodOptions_Open_xkb:ch::ger
+0xee168304fd52c6da	InputMethodOptions_Open_xkb:ch:fr:fra
+0x310e1c8edd3124fd	InputMethodOptions_Open_xkb:cz::cze
+0xe7c956d1a5fe18b8	InputMethodOptions_Open_xkb:de::ger
+0x54fd79dcc2c5078e	InputMethodOptions_Open_xkb:dk::dan
+0xaaa3e638c0277e5d	InputMethodOptions_Open_xkb:ee::est
+0x10d646c96bb290b0	InputMethodOptions_Open_xkb:es::spa
+0x9e9970f4b46c2945	InputMethodOptions_Open_xkb:es:cat:cat
+0x365b92eea899e7e7	InputMethodOptions_Open_xkb:fi::fin
+0xc81eae3dfb9e0b9d	InputMethodOptions_Open_xkb:fr::fra
+0x526ffe2c52ecda24	InputMethodOptions_Open_xkb:gb:extd:eng
+0x8030ee073cf7a3c6	InputMethodOptions_Open_xkb:gr::gre
+0xd154dbf3bb7c8107	InputMethodOptions_Open_xkb:hr::scr
+0x4f9eafd4473f6e19	InputMethodOptions_Open_xkb:hu::hun
+0x33f2b9f6c8539fde	InputMethodOptions_Open_xkb:il::heb
+0x36471978fb1b0bea	InputMethodOptions_Open_xkb:it::ita
+0x22020a263d5795ed	InputMethodOptions_Open_xkb:jp::jpn
+0xed01f2795c864acf	InputMethodOptions_Open_xkb:kr:kr104:kor
+0xc165f3fd0b803830	InputMethodOptions_Open_xkb:lt::lit
+0x18b9e4dbb8025455	InputMethodOptions_Open_xkb:lv::lav
+0x34a05814ab58931d	InputMethodOptions_Open_xkb:nl::nld
+0x25659d10deab047d	InputMethodOptions_Open_xkb:no::nor
+0xe39db1a9105a1816	InputMethodOptions_Open_xkb:pl::pol
+0x545654bd66e632ff	InputMethodOptions_Open_xkb:pt::por
+0x0b2eb1ceb2af7e31	InputMethodOptions_Open_xkb:ro::rum
+0x397d3a57fed5bbac	InputMethodOptions_Open_xkb:rs::srp
+0xd6b7cc8f607a5d62	InputMethodOptions_Open_xkb:ru::rus
+0xb6ded54d82c9c63d	InputMethodOptions_Open_xkb:ru:phonetic:rus
+0xf18cf6b9c54bcd9e	InputMethodOptions_Open_xkb:se::swe
+0x4fcae8c67666b3a4	InputMethodOptions_Open_xkb:si::slv
+0x06425a2a094ed04f	InputMethodOptions_Open_xkb:sk::slo
+0x0217ffe65d9240b7	InputMethodOptions_Open_xkb:tr::tur
+0x029ef6d08daae227	InputMethodOptions_Open_xkb:ua::ukr
+0x8242054ab1bd9fdf	InputMethodOptions_Open_xkb:us::eng
+0x6f0ca0c3f941e7f3	InputMethodOptions_Open_xkb:us:altgr-intl:eng
+0x8c4bc3c1ddaf086f	InputMethodOptions_Open_xkb:us:dvorak:eng
 0x3f383d6272a64128	InsertBacktab
 0x22d1980eb6def616	InsertHTML
 0x0ff692418469f747	InsertHorizontalRule
@@ -233,6 +309,268 @@
 0x204aad0f4a1f0f22	KeywordEditor_AddKeywordJS
 0x37ac83353fd9be1f	KeywordEditor_ModifiedKeyword
 0x2d038477eb20483b	KeywordEditor_RemoveKeyword
+0xcce20fb4bce11250	LanguageConfigView_Open
+0x6c9d4656451fe020	LanguageMenuButton_InputMethodChanged
+0x9895b811fa1a2f7e	LanguageMenuButton_Open
+0x4bef75db451d23fb	LanguageOptions_DisableInputMethod_chewing
+0xf336ef307e081efe	LanguageOptions_DisableInputMethod_hangul
+0x31f603e454ce9301	LanguageOptions_DisableInputMethod_m17n:ar:kbd
+0x8d99e4c7475dbc4e	LanguageOptions_DisableInputMethod_m17n:fa:isiri
+0x978a3702045ddd98	LanguageOptions_DisableInputMethod_m17n:hi:itrans
+0x3bf8f7a682215755	LanguageOptions_DisableInputMethod_m17n:th:kesmanee
+0x7ddb7bc2e25e4c86	LanguageOptions_DisableInputMethod_m17n:th:pattachote
+0x7c79ba0a7ddc551f	LanguageOptions_DisableInputMethod_m17n:th:tis820
+0x64a3fb231691a106	LanguageOptions_DisableInputMethod_m17n:vi:tcvn
+0x25c742d3c23ff71e	LanguageOptions_DisableInputMethod_m17n:vi:telex
+0x2282d16406d4149c	LanguageOptions_DisableInputMethod_m17n:vi:viqr
+0xc46962be71e81a74	LanguageOptions_DisableInputMethod_m17n:vi:vni
+0x6f8182b9533a7bf6	LanguageOptions_DisableInputMethod_m17n:zh:cangjie
+0xdd214c6e6e223f2c	LanguageOptions_DisableInputMethod_m17n:zh:quick
+0xe5b7a334a40a29b1	LanguageOptions_DisableInputMethod_mozc
+0x34c0af16cc2283f8	LanguageOptions_DisableInputMethod_mozc-dv
+0x1e33e194e43d85ff	LanguageOptions_DisableInputMethod_mozc-jp
+0xfd89518df98afaf3	LanguageOptions_DisableInputMethod_pinyin
+0x20108869230aba12	LanguageOptions_DisableInputMethod_xkb:be::fra
+0x977dc3accf7e638b	LanguageOptions_DisableInputMethod_xkb:be::ger
+0xcf0b649f9a1a59c7	LanguageOptions_DisableInputMethod_xkb:be::nld
+0xde0ba68a4ea3a9bf	LanguageOptions_DisableInputMethod_xkb:bg::bul
+0xdaacfedb410a091e	LanguageOptions_DisableInputMethod_xkb:bg:phonetic:bul
+0x60f266cb898affd4	LanguageOptions_DisableInputMethod_xkb:br::por
+0x4fecb3e04929aca2	LanguageOptions_DisableInputMethod_xkb:ca::fra
+0x197d8fb2f176e036	LanguageOptions_DisableInputMethod_xkb:ca:eng:eng
+0x64305300f1ffa8af	LanguageOptions_DisableInputMethod_xkb:ch::ger
+0xb3517f39d893bc56	LanguageOptions_DisableInputMethod_xkb:ch:fr:fra
+0xf407ba1d8f098570	LanguageOptions_DisableInputMethod_xkb:cz::cze
+0x66ec7b7c518dab3c	LanguageOptions_DisableInputMethod_xkb:de::ger
+0xaab2b2ab32b79eaf	LanguageOptions_DisableInputMethod_xkb:dk::dan
+0x231800f9acc70b4f	LanguageOptions_DisableInputMethod_xkb:ee::est
+0x55901fb5aa842097	LanguageOptions_DisableInputMethod_xkb:es::spa
+0xec86a454fb80111e	LanguageOptions_DisableInputMethod_xkb:es:cat:cat
+0x18ca64de485033c8	LanguageOptions_DisableInputMethod_xkb:fi::fin
+0x6d236611b97a8f64	LanguageOptions_DisableInputMethod_xkb:fr::fra
+0x13facbf7da2f7826	LanguageOptions_DisableInputMethod_xkb:gb:extd:eng
+0x215d96a1bda18a53	LanguageOptions_DisableInputMethod_xkb:gr::gre
+0x6e3d64f780b3424a	LanguageOptions_DisableInputMethod_xkb:hr::scr
+0x625fbaee633b4e53	LanguageOptions_DisableInputMethod_xkb:hu::hun
+0x14a66e0b221a13bb	LanguageOptions_DisableInputMethod_xkb:il::heb
+0xf5dbc48f5bcfd65f	LanguageOptions_DisableInputMethod_xkb:it::ita
+0x11cb89758a2d2606	LanguageOptions_DisableInputMethod_xkb:jp::jpn
+0x02b207c3740c92db	LanguageOptions_DisableInputMethod_xkb:kr:kr104:kor
+0xcafacab7d5bec6c3	LanguageOptions_DisableInputMethod_xkb:lt::lit
+0xa310032375e1a775	LanguageOptions_DisableInputMethod_xkb:lv::lav
+0xfb0bedc9f892abf2	LanguageOptions_DisableInputMethod_xkb:nl::nld
+0xc7210bf937ebf4d1	LanguageOptions_DisableInputMethod_xkb:no::nor
+0x4f7d52ae0938b86e	LanguageOptions_DisableInputMethod_xkb:pl::pol
+0xc7123952f2b4bf52	LanguageOptions_DisableInputMethod_xkb:pt::por
+0xbf5c339263965e41	LanguageOptions_DisableInputMethod_xkb:ro::rum
+0xf4c88d1eb003f153	LanguageOptions_DisableInputMethod_xkb:rs::srp
+0xddc77955cace9f69	LanguageOptions_DisableInputMethod_xkb:ru::rus
+0xb6e2bdd72bc5ca1b	LanguageOptions_DisableInputMethod_xkb:ru:phonetic:rus
+0xbdbbb828f1afce9f	LanguageOptions_DisableInputMethod_xkb:se::swe
+0xe65a7b8f5c72a35b	LanguageOptions_DisableInputMethod_xkb:si::slv
+0x8e05ca20d7d104fa	LanguageOptions_DisableInputMethod_xkb:sk::slo
+0x83928dfd8c874fd0	LanguageOptions_DisableInputMethod_xkb:tr::tur
+0x15f38552ce3ef440	LanguageOptions_DisableInputMethod_xkb:ua::ukr
+0x40118f4b64720619	LanguageOptions_DisableInputMethod_xkb:us::eng
+0x99b1530d498aa978	LanguageOptions_DisableInputMethod_xkb:us:altgr-intl:eng
+0x28a17da0e5170d9c	LanguageOptions_DisableInputMethod_xkb:us:dvorak:eng
+0xbf74d2491fd43546	LanguageOptions_EnableInputMethod_chewing
+0xa3850d86987729e3	LanguageOptions_EnableInputMethod_hangul
+0xbd41d816d8ffa4d0	LanguageOptions_EnableInputMethod_m17n:ar:kbd
+0xba649d035929fcc7	LanguageOptions_EnableInputMethod_m17n:fa:isiri
+0xd55995652310e97d	LanguageOptions_EnableInputMethod_m17n:hi:itrans
+0xc9349a3c4ea64758	LanguageOptions_EnableInputMethod_m17n:th:kesmanee
+0x8ebf5ecdd9403d86	LanguageOptions_EnableInputMethod_m17n:th:pattachote
+0xc1771d7b829a738e	LanguageOptions_EnableInputMethod_m17n:th:tis820
+0x094f24c724c35098	LanguageOptions_EnableInputMethod_m17n:vi:tcvn
+0x8f062dc3fbc54bd6	LanguageOptions_EnableInputMethod_m17n:vi:telex
+0xb31dc2cc3a8b46cd	LanguageOptions_EnableInputMethod_m17n:vi:viqr
+0x905e70ae85a254d9	LanguageOptions_EnableInputMethod_m17n:vi:vni
+0xfef5e66f81905f45	LanguageOptions_EnableInputMethod_m17n:zh:cangjie
+0x707054c3cc12ba9b	LanguageOptions_EnableInputMethod_m17n:zh:quick
+0xf757893b8f47d386	LanguageOptions_EnableInputMethod_mozc
+0x5e800e2879b118e1	LanguageOptions_EnableInputMethod_mozc-dv
+0x0876a103cad5d843	LanguageOptions_EnableInputMethod_mozc-jp
+0x56da8023f0cbe550	LanguageOptions_EnableInputMethod_pinyin
+0x7ddef14e3ae9ca9b	LanguageOptions_EnableInputMethod_xkb:be::fra
+0xcd6ff3d5d0cc4817	LanguageOptions_EnableInputMethod_xkb:be::ger
+0xcc82746494498dc4	LanguageOptions_EnableInputMethod_xkb:be::nld
+0x0aa7853408b07074	LanguageOptions_EnableInputMethod_xkb:bg::bul
+0x699564bdd5712be7	LanguageOptions_EnableInputMethod_xkb:bg:phonetic:bul
+0xc644632c62aeb8ca	LanguageOptions_EnableInputMethod_xkb:br::por
+0x3a2c133c17b2bc75	LanguageOptions_EnableInputMethod_xkb:ca::fra
+0x20bc5b77deb279f8	LanguageOptions_EnableInputMethod_xkb:ca:eng:eng
+0x6cb09a3c8026a7aa	LanguageOptions_EnableInputMethod_xkb:ch::ger
+0x9ad6a4a9638b5782	LanguageOptions_EnableInputMethod_xkb:ch:fr:fra
+0xa559566c8c6ea637	LanguageOptions_EnableInputMethod_xkb:cz::cze
+0x98af6ef5e3f72fb2	LanguageOptions_EnableInputMethod_xkb:de::ger
+0xd42956556814d1ac	LanguageOptions_EnableInputMethod_xkb:dk::dan
+0x0a403824d4bf1af8	LanguageOptions_EnableInputMethod_xkb:ee::est
+0x6c0a59356dde2eac	LanguageOptions_EnableInputMethod_xkb:es::spa
+0x8f92752907a878f4	LanguageOptions_EnableInputMethod_xkb:es:cat:cat
+0xcd068af26c3eeb04	LanguageOptions_EnableInputMethod_xkb:fi::fin
+0x23e04c4b87b2ec4a	LanguageOptions_EnableInputMethod_xkb:fr::fra
+0x61b45586224d5505	LanguageOptions_EnableInputMethod_xkb:gb:extd:eng
+0xcf2286bdb20f63dd	LanguageOptions_EnableInputMethod_xkb:gr::gre
+0xad8f3703500bedcc	LanguageOptions_EnableInputMethod_xkb:hr::scr
+0xe37001b17655d436	LanguageOptions_EnableInputMethod_xkb:hu::hun
+0x48ece720994692cd	LanguageOptions_EnableInputMethod_xkb:il::heb
+0xfbce8fb375d0cb10	LanguageOptions_EnableInputMethod_xkb:it::ita
+0xe86c32f284eaa235	LanguageOptions_EnableInputMethod_xkb:jp::jpn
+0x75254f6c14869f23	LanguageOptions_EnableInputMethod_xkb:kr:kr104:kor
+0x7e72cd1f5e56c8de	LanguageOptions_EnableInputMethod_xkb:lt::lit
+0x7e55464b40755c35	LanguageOptions_EnableInputMethod_xkb:lv::lav
+0x1a1ca3eb2d8f9b6d	LanguageOptions_EnableInputMethod_xkb:nl::nld
+0x06d15353036ca947	LanguageOptions_EnableInputMethod_xkb:no::nor
+0x1e7c51aa38eb9c65	LanguageOptions_EnableInputMethod_xkb:pl::pol
+0xa7e387a15749319e	LanguageOptions_EnableInputMethod_xkb:pt::por
+0x87a75b792f1d8ee1	LanguageOptions_EnableInputMethod_xkb:ro::rum
+0x38e76dba9085fa94	LanguageOptions_EnableInputMethod_xkb:rs::srp
+0x9c6ce402bd03337b	LanguageOptions_EnableInputMethod_xkb:ru::rus
+0x6bb6082988e4cbea	LanguageOptions_EnableInputMethod_xkb:ru:phonetic:rus
+0xf78f942da3223853	LanguageOptions_EnableInputMethod_xkb:se::swe
+0x46d0c5799ae35ae7	LanguageOptions_EnableInputMethod_xkb:si::slv
+0x00084283db086e29	LanguageOptions_EnableInputMethod_xkb:sk::slo
+0xc079d20c400f3e61	LanguageOptions_EnableInputMethod_xkb:tr::tur
+0xac38bf5ba676edfb	LanguageOptions_EnableInputMethod_xkb:ua::ukr
+0x4ae7cbf387b2ee2c	LanguageOptions_EnableInputMethod_xkb:us::eng
+0xfc019a30579d475d	LanguageOptions_EnableInputMethod_xkb:us:altgr-intl:eng
+0xf6b8e8d4de66cf77	LanguageOptions_EnableInputMethod_xkb:us:dvorak:eng
+0xfa78305d269c1ec1	LanguageOptions_Open
+0xda947fb4440a66e7	LanguageOptions_Restart
+0x28f95708216c5f3f	LanguageOptions_UiLanguageChange_af
+0x64bf99d3a3ae3c09	LanguageOptions_UiLanguageChange_am
+0x37e45415ff188c83	LanguageOptions_UiLanguageChange_ar
+0xc16e98ac284f7a2c	LanguageOptions_UiLanguageChange_az
+0x86afaa8af655ec3a	LanguageOptions_UiLanguageChange_be
+0xd3444f0a33415c12	LanguageOptions_UiLanguageChange_bg
+0x2a970136519d8e05	LanguageOptions_UiLanguageChange_bh
+0x373b5f9df58f10b1	LanguageOptions_UiLanguageChange_bn
+0xaa60c4c46bab2840	LanguageOptions_UiLanguageChange_br
+0x576186b20f58a62e	LanguageOptions_UiLanguageChange_bs
+0x2ee7812d1d628187	LanguageOptions_UiLanguageChange_ca
+0x0d39e71d36e3f98c	LanguageOptions_UiLanguageChange_co
+0x009ad7b74dd6eead	LanguageOptions_UiLanguageChange_cs
+0x9fc56d8b05719e95	LanguageOptions_UiLanguageChange_cy
+0x71c22450bc774ac6	LanguageOptions_UiLanguageChange_da
+0xdad8029db0738ca3	LanguageOptions_UiLanguageChange_de
+0xe5f02b9f07d5c321	LanguageOptions_UiLanguageChange_de-AT
+0x937082a0f96b339b	LanguageOptions_UiLanguageChange_de-CH
+0x60067bef740b0cee	LanguageOptions_UiLanguageChange_de-DE
+0x0598fe9cffcf7342	LanguageOptions_UiLanguageChange_el
+0x20682c0970bf6c39	LanguageOptions_UiLanguageChange_en
+0xb6b90d60aa7397dc	LanguageOptions_UiLanguageChange_en-AU
+0x20ffa805c7cb2d11	LanguageOptions_UiLanguageChange_en-CA
+0x0abeddf23bb637dd	LanguageOptions_UiLanguageChange_en-GB
+0x8e377316a588ae05	LanguageOptions_UiLanguageChange_en-NZ
+0x5e4314a4bd4d6ec1	LanguageOptions_UiLanguageChange_en-US
+0xacb33ac957ca869b	LanguageOptions_UiLanguageChange_en-ZA
+0xabb1750f364f3fdf	LanguageOptions_UiLanguageChange_eo
+0x42ef1c985cf8dac3	LanguageOptions_UiLanguageChange_es
+0x207a8d00a40289d5	LanguageOptions_UiLanguageChange_es-419
+0x3396cd1cc34fcd6b	LanguageOptions_UiLanguageChange_et
+0x1bc0603299c4c900	LanguageOptions_UiLanguageChange_eu
+0x4f3e8052d630b9ef	LanguageOptions_UiLanguageChange_fa
+0xef30a035ea67916e	LanguageOptions_UiLanguageChange_fi
+0x6b0bf8c255f455c4	LanguageOptions_UiLanguageChange_fil
+0xa43a6a0b854ffefd	LanguageOptions_UiLanguageChange_fo
+0x3636182675a031c8	LanguageOptions_UiLanguageChange_fr
+0x6f0bffdb3032caed	LanguageOptions_UiLanguageChange_fr-CA
+0xd912f13c73979882	LanguageOptions_UiLanguageChange_fr-CH
+0xe924dfbfd17a3242	LanguageOptions_UiLanguageChange_fr-FR
+0x061bf0d19eeef81e	LanguageOptions_UiLanguageChange_fy
+0x8251febc4083f54f	LanguageOptions_UiLanguageChange_ga
+0xccd31a77ee4366bf	LanguageOptions_UiLanguageChange_gd
+0x1f67f851b23ced0f	LanguageOptions_UiLanguageChange_gl
+0xcc9859375f855961	LanguageOptions_UiLanguageChange_gn
+0xd56c64f864957d91	LanguageOptions_UiLanguageChange_gu
+0xd08b36368944e379	LanguageOptions_UiLanguageChange_ha
+0xb3a6464f5fe71073	LanguageOptions_UiLanguageChange_haw
+0xed8f4616b34e2185	LanguageOptions_UiLanguageChange_he
+0x88ca2030cc3a49d9	LanguageOptions_UiLanguageChange_hi
+0xb8bd533bdc898a53	LanguageOptions_UiLanguageChange_hr
+0x746a1a0e63dd3f6d	LanguageOptions_UiLanguageChange_hu
+0x48906875b3fd6c95	LanguageOptions_UiLanguageChange_hy
+0x1366ee57f2aebfad	LanguageOptions_UiLanguageChange_ia
+0xff1d8f2925f8463c	LanguageOptions_UiLanguageChange_id
+0x915c19c85aed6a03	LanguageOptions_UiLanguageChange_is
+0xd1abd6db369ab7ef	LanguageOptions_UiLanguageChange_it
+0xe0c3a22acdd867b9	LanguageOptions_UiLanguageChange_it-CH
+0x3090b03a3e46582b	LanguageOptions_UiLanguageChange_it-IT
+0x60f4dd00cc06d874	LanguageOptions_UiLanguageChange_ja
+0x86c8f166345df95e	LanguageOptions_UiLanguageChange_jw
+0x670ea55ac2c8b062	LanguageOptions_UiLanguageChange_ka
+0x5b57cde2d36ca8cd	LanguageOptions_UiLanguageChange_kk
+0xbeb6576493ae6d05	LanguageOptions_UiLanguageChange_km
+0xce996c9699b3168c	LanguageOptions_UiLanguageChange_kn
+0xbd07adaea57b26f5	LanguageOptions_UiLanguageChange_ko
+0x4f0a66f954fa580e	LanguageOptions_UiLanguageChange_ku
+0xb87acb54b22131c8	LanguageOptions_UiLanguageChange_ky
+0x8263585e1943372f	LanguageOptions_UiLanguageChange_la
+0x6642ed654dd4aaa4	LanguageOptions_UiLanguageChange_ln
+0x273efc98e31a51cd	LanguageOptions_UiLanguageChange_lo
+0xd25cfe9ca78a31d7	LanguageOptions_UiLanguageChange_lt
+0x794081adfcb1744c	LanguageOptions_UiLanguageChange_lv
+0xf6ea1c5fc4dcafb8	LanguageOptions_UiLanguageChange_mk
+0x2258884fcb94b3a3	LanguageOptions_UiLanguageChange_ml
+0x00bdaddaf47561d1	LanguageOptions_UiLanguageChange_mn
+0x3b0c2fa0b7b027db	LanguageOptions_UiLanguageChange_mo
+0xfec577eb29f4b768	LanguageOptions_UiLanguageChange_mr
+0x2d1ef24818ca5e4f	LanguageOptions_UiLanguageChange_ms
+0x06ddcd11da46bb50	LanguageOptions_UiLanguageChange_mt
+0x5683a40b0b8caa20	LanguageOptions_UiLanguageChange_nb
+0x2ba4d49749d043fa	LanguageOptions_UiLanguageChange_ne
+0x584a118482ee3a32	LanguageOptions_UiLanguageChange_nl
+0x7ca178a2a1311c1e	LanguageOptions_UiLanguageChange_nn
+0xcef3082674f7bfc0	LanguageOptions_UiLanguageChange_no
+0x4ef5f77644dbfc68	LanguageOptions_UiLanguageChange_oc
+0x648ba70088175e47	LanguageOptions_UiLanguageChange_om
+0xb76df1c750016022	LanguageOptions_UiLanguageChange_or
+0x4d3566c9fb39fde3	LanguageOptions_UiLanguageChange_pa
+0xb2e1327766d055ad	LanguageOptions_UiLanguageChange_pl
+0x9e562f625cfbb008	LanguageOptions_UiLanguageChange_ps
+0xd970808d9c9448d1	LanguageOptions_UiLanguageChange_pt
+0xf7b46f1138de06a9	LanguageOptions_UiLanguageChange_pt-BR
+0x086ef991869ac783	LanguageOptions_UiLanguageChange_pt-PT
+0x69a974172e5e9f73	LanguageOptions_UiLanguageChange_qu
+0xdd1935e2579c1284	LanguageOptions_UiLanguageChange_rm
+0xe5738c8e946ba1d0	LanguageOptions_UiLanguageChange_ro
+0x125913fb14d47526	LanguageOptions_UiLanguageChange_ru
+0x0f156a0f15f74bb8	LanguageOptions_UiLanguageChange_sd
+0x9240b6a14cd35919	LanguageOptions_UiLanguageChange_sh
+0x6763083d96429a61	LanguageOptions_UiLanguageChange_si
+0x587831f4b9220eca	LanguageOptions_UiLanguageChange_sk
+0x15a09e54aa1e9f4a	LanguageOptions_UiLanguageChange_sl
+0x6a5ac197de560ec4	LanguageOptions_UiLanguageChange_sn
+0x93472fab0fe3f061	LanguageOptions_UiLanguageChange_so
+0x1bbc961a4eb4fb07	LanguageOptions_UiLanguageChange_sq
+0xb1392f5ad48fe1a7	LanguageOptions_UiLanguageChange_sr
+0x04e5f8326179901e	LanguageOptions_UiLanguageChange_st
+0x5fef5745a2763b80	LanguageOptions_UiLanguageChange_su
+0x8993a9d1df3ccc59	LanguageOptions_UiLanguageChange_sv
+0xaedab7909dff790b	LanguageOptions_UiLanguageChange_sw
+0x6c1f62315896ca95	LanguageOptions_UiLanguageChange_ta
+0x762084c13a9a9b62	LanguageOptions_UiLanguageChange_te
+0x0060f27c68e28c87	LanguageOptions_UiLanguageChange_tg
+0x80b5fea53c9d6164	LanguageOptions_UiLanguageChange_th
+0xeeb3bd273099c7d3	LanguageOptions_UiLanguageChange_ti
+0xfa67fec49e23c547	LanguageOptions_UiLanguageChange_tk
+0x052e8ac2c052128c	LanguageOptions_UiLanguageChange_to
+0xaa97a95d0c9e20b5	LanguageOptions_UiLanguageChange_tr
+0x8e949fbebe2126cf	LanguageOptions_UiLanguageChange_tt
+0xe0fc96469f2d822f	LanguageOptions_UiLanguageChange_tw
+0xa4a84a5651503494	LanguageOptions_UiLanguageChange_ug
+0x0b0bcb0d93b5a367	LanguageOptions_UiLanguageChange_uk
+0x2be9356bc4812c15	LanguageOptions_UiLanguageChange_ur
+0xe0e1ece201b6889f	LanguageOptions_UiLanguageChange_uz
+0x28a1a4b9dc5a83f1	LanguageOptions_UiLanguageChange_vi
+0xf16ab2f1f9cfeaab	LanguageOptions_UiLanguageChange_xh
+0x26561f9577c4d728	LanguageOptions_UiLanguageChange_yi
+0x0d5d98b098d7429b	LanguageOptions_UiLanguageChange_yo
+0xa9b1ee532cc5580b	LanguageOptions_UiLanguageChange_zh
+0xbee911865b93d504	LanguageOptions_UiLanguageChange_zh-CN
+0x03a61bc8bd6c791b	LanguageOptions_UiLanguageChange_zh-TW
+0xd93d87f83683d666	LanguageOptions_UiLanguageChange_zu
 0x384a6609143bbcae	LoadURL
 0xe009e92f3909009c	LoadURLFromKeyword
 0x84ba0ed3cbdf3956	MediaContextMenu_Controls
@@ -299,10 +637,14 @@
 0x5e3bd4e3535ecc38	OpenAllBookmarksNewWindow
 0x4b858349a1b8bb15	OpenFile
 0x4928347f9423c013	OpenInternetOptionsDialog
+0x83af6accb98b9954	OpenLanguageOptionsDialog
 0xe7147544a7db079d	OpenSystemOptionsDialog
+0xe4f08e5732cebbd3	OpenTabpose
 0x7d3309f039cebdb1	Options_AppLanguage
 0xaabae975f4a0bb66	Options_AskForSaveLocation_Disable
 0x85464d6e64bbb505	Options_AskForSaveLocation_Enable
+0xbf4441a54e9b8e50	Options_BackgroundMode_Disable
+0xc481e10b3ba27f8c	Options_BackgroundMode_Enable
 0xc65558de1b0b2371	Options_BlockAllPopups_Disable
 0x6886cd43bb132ac1	Options_BlockAllPopups_Enable
 0xac4f01f24c2cad48	Options_ChangeProxies
@@ -329,6 +671,7 @@
 0xe1d9dbcef8116c71	Options_JavaCheckbox_Enable
 0x704c162610c6ffd5	Options_LinkDoctorCheckbox_Disable
 0x64ea4cda15571db8	Options_LinkDoctorCheckbox_Enable
+0xd97025bbf470c3ba	Options_ManageSSLCertificates
 0xfeb23e6946b41cdc	Options_ManageSearchEngines
 0x84502179f3e2ae8c	Options_ManagerCerts
 0x540bea8eaba24835	Options_MetricsReportingCheckbox_Disable
@@ -353,6 +696,7 @@
 0x626c01f2ae5a9ba2	Options_ShowCookies
 0x9b00328b8c542526	Options_ShowPasswordManager
 0x1d4a5f924ea24d2c	Options_ShowPasswordsExceptions
+0xc7fbc422d732eac5	Options_ShowProxySettings
 0xc9362f32313889f1	Options_SpeedFactorSlider_Changed
 0xf9f1e5efda6f9978	Options_Startup_Custom
 0xf8e60cd9af4e6187	Options_Startup_Homepage
@@ -482,6 +826,7 @@
 0x852721aa5fc738df	Underline
 0x1cdc076b28f70afa	Undo
 0xc1a39b6a60f8b2f8	Unlink
+0xbcd41ce97e3c5568	UpdateChrome
 0x9b4b5afb2e791f23	UpgradeCheck_AlreadyUpToDate
 0x27b72192736f904d	UpgradeCheck_AlreadyUpgraded
 0x7a54d49f1f7db4ee	UpgradeCheck_Done
diff --git a/chrome/tools/extract_actions.py b/chrome/tools/extract_actions.py
index 6b448d6..3543db7 100755
--- a/chrome/tools/extract_actions.py
+++ b/chrome/tools/extract_actions.py
@@ -16,6 +16,7 @@ See also:
   http://wiki.corp.google.com/twiki/bin/view/Main/ChromeUserExperienceMetrics
 
 Run it from the chrome/tools directory like:
+  export PYTHONPATH=../../tools/python  # for google.path_utils
   extract_actions.py
 or
   extract_actions.py --hash
@@ -43,6 +44,60 @@ KNOWN_COMPUTED_USERS = (
   'new_tab_ui.cc',  # most visited clicks 1-9
   'extension_metrics_module.cc', # extensions hook for user metrics
   'safe_browsing_blocking_page.cc', # various interstitial types and actions
+  'language_options_handler.cc', # languages and input methods in chrome os
+)
+
+# Language codes used in Chrome. The list should be updated when a new
+# language is added to app/l10n_util.cc, as follows:
+#
+# % (cat app/l10n_util.cc | \
+#    perl -n0e 'print $1 if /kAcceptLanguageList.*?\{(.*?)\}/s' | \
+#    perl -nle 'print $1, if /"(.*)"/'; echo 'es-419') | \
+#   sort | perl -pe "s/(.*)\n/'\$1', /" | \
+#   fold -w75 -s | perl -pe 's/^/  /;s/ $//'; echo
+#
+# The script extracts language codes from kAcceptLanguageList, but es-419
+# (Spanish in Latin America) is an exception.
+LANGUAGE_CODES = (
+  'af', 'am', 'ar', 'az', 'be', 'bg', 'bh', 'bn', 'br', 'bs', 'ca', 'co',
+  'cs', 'cy', 'da', 'de', 'de-AT', 'de-CH', 'de-DE', 'el', 'en', 'en-AU',
+  'en-CA', 'en-GB', 'en-NZ', 'en-US', 'en-ZA', 'eo', 'es', 'es-419', 'et',
+  'eu', 'fa', 'fi', 'fil', 'fo', 'fr', 'fr-CA', 'fr-CH', 'fr-FR', 'fy',
+  'ga', 'gd', 'gl', 'gn', 'gu', 'ha', 'haw', 'he', 'hi', 'hr', 'hu', 'hy',
+  'ia', 'id', 'is', 'it', 'it-CH', 'it-IT', 'ja', 'jw', 'ka', 'kk', 'km',
+  'kn', 'ko', 'ku', 'ky', 'la', 'ln', 'lo', 'lt', 'lv', 'mk', 'ml', 'mn',
+  'mo', 'mr', 'ms', 'mt', 'nb', 'ne', 'nl', 'nn', 'no', 'oc', 'om', 'or',
+  'pa', 'pl', 'ps', 'pt', 'pt-BR', 'pt-PT', 'qu', 'rm', 'ro', 'ru', 'sd',
+  'sh', 'si', 'sk', 'sl', 'sn', 'so', 'sq', 'sr', 'st', 'su', 'sv', 'sw',
+  'ta', 'te', 'tg', 'th', 'ti', 'tk', 'to', 'tr', 'tt', 'tw', 'ug', 'uk',
+  'ur', 'uz', 'vi', 'xh', 'yi', 'yo', 'zh', 'zh-CN', 'zh-TW', 'zu',
+)
+
+# Input method IDs used in Chrome OS. The list should be updated when a
+# new input method is added to platform/assets/input_methods/whitelist.txt
+# in the Chrome OS tree, as follows:
+#
+# % sort chromeos/src/platform/assets/input_methods/whitelist.txt | \
+#   perl -ne "print \"'\$1', \" if /^([^#]+?)\s/" | \
+#   fold -w75 -s | perl -pe 's/^/  /;s/ $//'; echo
+#
+# The script extracts input method IDs from whitelist.txt.
+INPUT_METHOD_IDS = (
+  'chewing', 'hangul', 'm17n:ar:kbd', 'm17n:fa:isiri', 'm17n:hi:itrans',
+  'm17n:th:kesmanee', 'm17n:th:pattachote', 'm17n:th:tis820',
+  'm17n:vi:tcvn', 'm17n:vi:telex', 'm17n:vi:viqr', 'm17n:vi:vni',
+  'm17n:zh:cangjie', 'm17n:zh:quick', 'mozc', 'mozc-dv', 'mozc-jp',
+  'pinyin', 'xkb:be::fra', 'xkb:be::ger', 'xkb:be::nld', 'xkb:bg::bul',
+  'xkb:bg:phonetic:bul', 'xkb:br::por', 'xkb:ca::fra', 'xkb:ca:eng:eng',
+  'xkb:ch::ger', 'xkb:ch:fr:fra', 'xkb:cz::cze', 'xkb:de::ger',
+  'xkb:dk::dan', 'xkb:ee::est', 'xkb:es::spa', 'xkb:es:cat:cat',
+  'xkb:fi::fin', 'xkb:fr::fra', 'xkb:gb:extd:eng', 'xkb:gr::gre',
+  'xkb:hr::scr', 'xkb:hu::hun', 'xkb:il::heb', 'xkb:it::ita', 'xkb:jp::jpn',
+  'xkb:kr:kr104:kor', 'xkb:lt::lit', 'xkb:lv::lav', 'xkb:nl::nld',
+  'xkb:no::nor', 'xkb:pl::pol', 'xkb:pt::por', 'xkb:ro::rum', 'xkb:rs::srp',
+  'xkb:ru::rus', 'xkb:ru:phonetic:rus', 'xkb:se::swe', 'xkb:si::slv',
+  'xkb:sk::slo', 'xkb:tr::tur', 'xkb:ua::ukr', 'xkb:us::eng',
+  'xkb:us:altgr-intl:eng', 'xkb:us:dvorak:eng',
 )
 
 number_of_files_total = 0
@@ -72,6 +127,14 @@ def AddComputedActions(actions):
     for action in ('Show', 'Proceed', 'DontProceed'):
       actions.add('SBInterstitial%s%s' % (interstitial, action))
 
+  # Actions for language_options_handler.cc (Chrome OS specific).
+  for input_method_id in INPUT_METHOD_IDS:
+    actions.add('LanguageOptions_DisableInputMethod_%s' % input_method_id)
+    actions.add('LanguageOptions_EnableInputMethod_%s' % input_method_id)
+    actions.add('InputMethodOptions_Open_%s' % input_method_id)
+  for language_code in LANGUAGE_CODES:
+    actions.add('LanguageOptions_UiLanguageChange_%s' % language_code)
+
 def AddWebKitEditorActions(actions):
   """Add editor actions from editor_client_impl.cc.