Promote chrome app window frame color to stable.

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 "apps/app_window.h"
 #include "apps/app_window_contents.h"
 #include "apps/app_window_registry.h"
 #include "apps/apps_client.h"
@@ skipping 26 matching lines @@
 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 kInvalidColorSpecification[] =
     "The color specification could not be parsed.";
 const char kInvalidChannelForFrameOptions[] =
     "Frame options are only available in dev channel.";

[Matt Giuca, 2014/05/07 11:48:34]

Shouldn't this be going away?

[benwells, 2014/05/08 02:43:18]

Done.

 const char kColorWithFrameNone[] = "Windows with no frame cannot have a color.";
 const char kInactiveColorWithoutColor[] =
     "frame.inactiveColor must be used with frame.color.";
 const char kConflictingBoundsOptions[] =
     "The $1 property cannot be specified for both inner and outer bounds.";
 }  // namespace app_window_constants
 
 const char kNoneFrameOption[] = "none";
   // TODO(benwells): Remove HTML titlebar injection.
 const char kHtmlFrameOption[] = "experimental-html";
@@ skipping 196 matching lines @@
         case extensions::api::app_window::STATE_MAXIMIZED:
           create_params.state = ui::SHOW_STATE_MAXIMIZED;
           break;
         case extensions::api::app_window::STATE_MINIMIZED:
           create_params.state = ui::SHOW_STATE_MINIMIZED;
           break;
       }
     }
   }
 
-  UpdateFrameOptionsForChannel(&create_params);
-
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
   AppWindow* app_window = apps::AppsClient::Get()->CreateAppWindow(
       browser_context(), GetExtension());
   app_window->Init(
       url, new apps::AppWindowContentsImpl(app_window), create_params);
 
   if (ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode())
     app_window->ForcedFullscreen();
@@ skipping 155 matching lines @@
     AppWindow::CreateParams* create_params) {
   if (!options.frame)
     return true;
 
   DCHECK(options.frame->as_string || options.frame->as_frame_options);
   if (options.frame->as_string) {
     create_params->frame = GetFrameFromString(*options.frame->as_string);
     return true;
   }
 
   if (GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV) {

[Matt Giuca, 2014/05/07 11:48:34]

And this?

[benwells, 2014/05/08 02:43:18]

Indeed it should. Gone.

     error_ = app_window_constants::kInvalidChannelForFrameOptions;
     return false;
   }
 
   if (options.frame->as_frame_options->type)
     create_params->frame =
         GetFrameFromString(*options.frame->as_frame_options->type);
 
   if (options.frame->as_frame_options->color.get()) {
     if (create_params->frame != AppWindow::FRAME_CHROME) {
@@ skipping 24 matching lines @@
   }
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     error_ = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
-void AppWindowCreateFunction::UpdateFrameOptionsForChannel(
-    apps::AppWindow::CreateParams* create_params) {
-#if defined(OS_WIN)
-  if (create_params->frame == AppWindow::FRAME_CHROME &&
-      GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV) {
-    // If not on trunk or dev channel, always use the standard white frame.
-    // TODO(benwells): Remove this code once we get agreement to use the new
-    // native style frame.
-    create_params->has_frame_color = true;
-    create_params->active_frame_color = SK_ColorWHITE;
-    create_params->inactive_frame_color = SK_ColorWHITE;
-  }
-#endif
-}
-
 }  // namespace extensions