Whitelist IME extenions for app.window with type:panel

extensions/browser/api/app_window/app_window_api.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 "extensions/browser/api/app_window/app_window_api.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
@@ skipping 48 matching lines @@
 const char kAlphaEnabledNeedsFrameNone[] =
     "The alphaEnabled option can only be used with \"frame: 'none'\".";
 const char kImeWindowMissingPermission[] =
     "Extensions require the \"app.window.ime\" permission to create windows.";
 const char kImeOptionIsNotSupported[] =
     "The \"ime\" option is not supported for platform app.";
 #if !defined(OS_CHROMEOS)
 const char kImeWindowUnsupportedPlatform[] =
     "The \"ime\" option can only be used on ChromeOS.";
 #else
-const char kImeOptionMustBeTrueAndNeedsFrameNone[] =
-    "IME extensions must create window with \"ime: true\" and "
-    "\"frame: 'none'\".";
+const char kImeWindowMustBeImeWindowOrPanel[] =
+    "IME extensions must create ime window ( with \"ime: true\" and "
+    "\"frame: 'none'\") or panel window (with \"type: panel\").";
 #endif
 }  // namespace app_window_constants
 
 const char kNoneFrameOption[] = "none";
   // TODO(benwells): Remove HTML titlebar injection.
 const char kHtmlFrameOption[] = "experimental-html";
 
 namespace {
 
 // If the same property is specified for the inner and outer bounds, raise an
@@ skipping 146 matching lines @@
               APIPermission::kImeWindowEnabled)) {
         error_ = app_window_constants::kImeWindowMissingPermission;
         return false;
       }
 
 #if !defined(OS_CHROMEOS)
       // IME window is only supported on ChromeOS.
       error_ = app_window_constants::kImeWindowUnsupportedPlatform;
       return false;
 #else
-      // IME extensions must create window with "ime: true" and "frame: none".
-      if (!options->ime.get() || !*options->ime.get() ||
-          create_params.frame != AppWindow::FRAME_NONE) {
-        error_ = app_window_constants::kImeOptionMustBeTrueAndNeedsFrameNone;
+      // IME extensions must create ime window (with "ime: true" and
+      // "frame: none") or panel window (with "type: panel").
+      if (options->ime.get() && *options->ime.get() &&
+          create_params.frame == AppWindow::FRAME_NONE) {
+        create_params.is_ime_window = true;
+      } else if (options->type == app_window::WINDOW_TYPE_PANEL) {
+        create_params.window_type = AppWindow::WINDOW_TYPE_PANEL;
+      } else {
+        error_ = app_window_constants::kImeWindowMustBeImeWindowOrPanel;
         return false;
       }
-      create_params.is_ime_window = true;
 #endif  // OS_CHROMEOS
     } else {
       if (options->ime.get()) {
         error_ = app_window_constants::kImeOptionIsNotSupported;
         return false;
       }
     }
 
     if (options->alpha_enabled.get()) {
       const char* const kWhitelist[] = {
@@ skipping 303 matching lines @@
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     error_ = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions