Whitelist Google Input Tool for app.window and app.window.alpha

BUG=435380 Review URL: https://codereview.chromium.org/748633002 Cr-Commit-Position: refs/heads/master@{#305497}
Denger-Network · Nov 24, 2014 · 81455ad · 81455ad
1 parent e82faa1
commit 81455ad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/chrome/browser/resources/chromeos/input_method/google_input_tools_manifest.json b/chrome/browser/resources/chromeos/input_method/google_input_tools_manifest.json
@@ -6,6 +6,8 @@
   "default_locale": "en",
   "incognito": "split",
   "permissions": [
+    "app.window.ime",
+    "app.window.alpha",
     "input",
     "unlimitedStorage",
     "inputMethodPrivate",

diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
@@ -44,7 +44,8 @@
       "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
       "12E618C3C6E97495AAECF2AC12DEB082353241C6",  // QO component extension
       "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",  // Official xkb extension
-      "F94EE6AB36D6C6588670B2B01EB65212D9C64E33"   // Open source xkb extension
+      "F94EE6AB36D6C6588670B2B01EB65212D9C64E33",  // Open source xkb extension
+      "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A"   // Google input tools
     ],
     "channel": "stable",
     "extension_types": ["hosted_app", "extension", "legacy_packaged_app"],

diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc
@@ -252,6 +252,7 @@ bool AppWindowCreateFunction::RunAsync() {
         "B58B99751225318C7EB8CF4688B5434661083E07",  // http://crbug.com/410550
         "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",  // http://crbug.com/425539
         "F94EE6AB36D6C6588670B2B01EB65212D9C64E33",
+        "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A",  // http://crbug.com/435380
 #endif
         "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
         "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",

diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
@@ -48,6 +48,7 @@
     "noparent": true,
     "component_extensions_auto_granted": false,
     "whitelist": [
+      "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A",  // Google input tools
       "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",  // Official xkb extension
       "F94EE6AB36D6C6588670B2B01EB65212D9C64E33"   // Open source xkb extension
     ]

diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json
@@ -58,7 +58,8 @@
       "extension_types": ["extension"],
       "whitelist": [
         "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",  // http://crbug.com/425539
-        "F94EE6AB36D6C6588670B2B01EB65212D9C64E33"
+        "F94EE6AB36D6C6588670B2B01EB65212D9C64E33",
+        "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A"   // http://crbug.com/435380
       ]
     }
   ],
@@ -73,7 +74,8 @@
        "platforms": ["chromeos"],
        "whitelist": [
          "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",
-         "F94EE6AB36D6C6588670B2B01EB65212D9C64E33"
+         "F94EE6AB36D6C6588670B2B01EB65212D9C64E33",
+         "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A"   // http://crbug.com/435380
        ]
     }
   ],