| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/browser/api/app_window/app_window_api.h" | 5 #include "extensions/browser/api/app_window/app_window_api.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 if (options->type == app_window::WINDOW_TYPE_PANEL) { | 197 if (options->type == app_window::WINDOW_TYPE_PANEL) { |
| 198 create_params.window_type = AppWindow::WINDOW_TYPE_PANEL; | 198 create_params.window_type = AppWindow::WINDOW_TYPE_PANEL; |
| 199 } | 199 } |
| 200 } | 200 } |
| 201 | 201 |
| 202 if (!GetFrameOptions(*options, &create_params)) | 202 if (!GetFrameOptions(*options, &create_params)) |
| 203 return false; | 203 return false; |
| 204 | 204 |
| 205 if (options->alpha_enabled.get()) { | 205 if (options->alpha_enabled.get()) { |
| 206 const char* whitelist[] = { | 206 const char* whitelist[] = { |
| 207 #if defined(OS_CHROMEOS) |
| 208 "B58B99751225318C7EB8CF4688B5434661083E07", // http://crbug.com/410550 |
| 209 #endif |
| 207 "0F42756099D914A026DADFA182871C015735DD95", // http://crbug.com/323773 | 210 "0F42756099D914A026DADFA182871C015735DD95", // http://crbug.com/323773 |
| 208 "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7", | 211 "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7", |
| 209 "E7E2461CE072DF036CF9592740196159E2D7C089", // http://crbug.com/356200 | 212 "E7E2461CE072DF036CF9592740196159E2D7C089", // http://crbug.com/356200 |
| 210 "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3", | 213 "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3", |
| 211 "312745D9BF916161191143F6490085EEA0434997", | 214 "312745D9BF916161191143F6490085EEA0434997", |
| 212 "53041A2FA309EECED01FFC751E7399186E860B2C" | 215 "53041A2FA309EECED01FFC751E7399186E860B2C" |
| 213 }; | 216 }; |
| 214 if (AppsClient::Get()->IsCurrentChannelOlderThanDev() && | 217 if (AppsClient::Get()->IsCurrentChannelOlderThanDev() && |
| 215 !extensions::SimpleFeature::IsIdInList( | 218 !extensions::SimpleFeature::IsIdInList( |
| 216 extension_id(), | 219 extension_id(), |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 | 490 |
| 488 if (options.frame->as_frame_options->inactive_color.get()) { | 491 if (options.frame->as_frame_options->inactive_color.get()) { |
| 489 error_ = app_window_constants::kInactiveColorWithoutColor; | 492 error_ = app_window_constants::kInactiveColorWithoutColor; |
| 490 return false; | 493 return false; |
| 491 } | 494 } |
| 492 | 495 |
| 493 return true; | 496 return true; |
| 494 } | 497 } |
| 495 | 498 |
| 496 } // namespace extensions | 499 } // namespace extensions |
| OLD | NEW |