Re-enable native UI for {frame:'chrome'} in app windows.

chrome/browser/extensions/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 "chrome/browser/extensions/api/app_window/app_window_api.h"
 
+#include "base/command_line.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 namespace app_window = extensions::api::app_window;
 namespace Create = app_window::Create;
 
 namespace extensions {
 
 namespace app_window_constants {
 const char kInvalidWindowId[] =
     "The window id can not be more than 256 characters long.";
 };
 
 const char kNoneFrameOption[] = "none";
+const char kHtmlFrameOption[] = "experimental-html";
 
 bool AppWindowCreateFunction::RunImpl() {
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GURL url = GetExtension()->GetResourceURL(params->url);
 
+  bool inject_html_titlebar = false;
+
   // TODO(jeremya): figure out a way to pass the opening WebContents through to
   // ShellWindow::Create so we can set the opener at create time rather than
   // with a hack in AppWindowCustomBindings::GetView().
   ShellWindow::CreateParams create_params;
   app_window::CreateWindowOptions* options = params->options.get();
   if (options) {
     if (options->id.get()) {
       // TODO(mek): use URL if no id specified?
       // Limit length of id to 256 characters.
       if (options->id->length() > 256) {
@@ skipping 23 matching lines @@
     }
 
     if (options->left.get() || options->top.get()) {
       if (options->left.get())
         create_params.bounds.set_x(*options->left.get());
       if (options->top.get())
         create_params.bounds.set_y(*options->top.get());
       create_params.restore_position = false;
     }
 
+    if (options->frame.get()) {
+      if (*options->frame == kHtmlFrameOption &&
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableExperimentalExtensionApis)) {
+        create_params.frame = ShellWindow::CreateParams::FRAME_NONE;
+        inject_html_titlebar = true;
+      } else if (*options->frame == kNoneFrameOption) {
+        create_params.frame = ShellWindow::CreateParams::FRAME_NONE;
+      } else {
+        create_params.frame = ShellWindow::CreateParams::FRAME_CHROME;
+      }
+    }
+
     gfx::Size& minimum_size = create_params.minimum_size;
     if (options->min_width.get())
       minimum_size.set_width(*options->min_width);
     if (options->min_height.get())
       minimum_size.set_height(*options->min_height);
     gfx::Size& maximum_size = create_params.maximum_size;
     if (options->max_width.get())
       maximum_size.set_width(*options->max_width);
     if (options->max_height.get())
       maximum_size.set_height(*options->max_height);
@@ skipping 16 matching lines @@
     if (create_params.bounds.height() < minimum_size.height())
       create_params.bounds.set_height(minimum_size.height());
   }
   ShellWindow* shell_window =
       ShellWindow::Create(profile(), GetExtension(), url, create_params);
   shell_window->GetBaseWindow()->Show();
 
   content::WebContents* created_contents = shell_window->web_contents();
   int view_id = created_contents->GetRenderViewHost()->GetRoutingID();
 
-  SetResult(base::Value::CreateIntegerValue(view_id));
+  base::DictionaryValue* result = new base::DictionaryValue;
+  result->Set("viewId", base::Value::CreateIntegerValue(view_id));
+  result->Set("injectTitlebar",
+      base::Value::CreateBooleanValue(inject_html_titlebar));
+  SetResult(result);
   return true;
 }
 
 }  // namespace extensions