| Index: chrome/browser/extensions/api/app_window/app_window_api.cc
|
| diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| index 4f2b68eaf5672670e0a9279fb614087e130a07c2..df69c46866f22896953295e018363fca62e6f07c 100644
|
| --- a/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| @@ -261,8 +261,6 @@ bool AppWindowCreateFunction::RunAsync() {
|
| }
|
| }
|
|
|
| - UpdateFrameOptionsForChannel(&create_params);
|
| -
|
| create_params.creator_process_id =
|
| render_view_host_->GetProcess()->GetID();
|
|
|
| @@ -483,19 +481,4 @@ bool AppWindowCreateFunction::GetFrameOptions(
|
| 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
|
|
|