Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Side by Side Diff: extensions/browser/api/app_window/app_window_api.cc

Issue 568393002: Add whitelist for crbug.com/413748 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 if (options->alpha_enabled.get()) { 207 if (options->alpha_enabled.get()) {
208 const char* whitelist[] = { 208 const char* whitelist[] = {
209 #if defined(OS_CHROMEOS) 209 #if defined(OS_CHROMEOS)
210 "B58B99751225318C7EB8CF4688B5434661083E07", // http://crbug.com/410550 210 "B58B99751225318C7EB8CF4688B5434661083E07", // http://crbug.com/410550
211 #endif 211 #endif
212 "0F42756099D914A026DADFA182871C015735DD95", // http://crbug.com/323773 212 "0F42756099D914A026DADFA182871C015735DD95", // http://crbug.com/323773
213 "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7", 213 "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
214 "E7E2461CE072DF036CF9592740196159E2D7C089", // http://crbug.com/356200 214 "E7E2461CE072DF036CF9592740196159E2D7C089", // http://crbug.com/356200
215 "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3", 215 "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
216 "312745D9BF916161191143F6490085EEA0434997", 216 "312745D9BF916161191143F6490085EEA0434997",
217 "53041A2FA309EECED01FFC751E7399186E860B2C" 217 "53041A2FA309EECED01FFC751E7399186E860B2C",
218 "A07A5B743CD82A1C2579DB77D353C98A23201EEF", // http://crbug.com/413748
219 "F16F23C83C5F6DAD9B65A120448B34056DD80691",
220 "0F585FB1D0FDFBEBCE1FEB5E9DFFB6DA476B8C9B"
218 }; 221 };
219 if (AppsClient::Get()->IsCurrentChannelOlderThanDev() && 222 if (AppsClient::Get()->IsCurrentChannelOlderThanDev() &&
220 !extensions::SimpleFeature::IsIdInList( 223 !extensions::SimpleFeature::IsIdInList(
221 extension_id(), 224 extension_id(),
222 std::set<std::string>(whitelist, 225 std::set<std::string>(whitelist,
223 whitelist + arraysize(whitelist)))) { 226 whitelist + arraysize(whitelist)))) {
224 error_ = app_window_constants::kAlphaEnabledWrongChannel; 227 error_ = app_window_constants::kAlphaEnabledWrongChannel;
225 return false; 228 return false;
226 } 229 }
227 if (!extension()->permissions_data()->HasAPIPermission( 230 if (!extension()->permissions_data()->HasAPIPermission(
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 504
502 if (options.frame->as_frame_options->inactive_color.get()) { 505 if (options.frame->as_frame_options->inactive_color.get()) {
503 error_ = app_window_constants::kInactiveColorWithoutColor; 506 error_ = app_window_constants::kInactiveColorWithoutColor;
504 return false; 507 return false;
505 } 508 }
506 509
507 return true; 510 return true;
508 } 511 }
509 512
510 } // namespace extensions 513 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/_permission_features.json ('k') | extensions/common/api/_permission_features.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698