| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/common/extensions/chrome_extensions_client.h" | 5 #include "chrome/common/extensions/chrome_extensions_client.h" |
| 6 | 6 |
| 7 #include "apps/common/api/generated_schemas.h" | 7 #include "apps/common/api/generated_schemas.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "chrome/common/chrome_version_info.h" | 9 #include "chrome/common/chrome_version_info.h" |
| 10 #include "chrome/common/extensions/api/generated_schemas.h" | 10 #include "chrome/common/extensions/api/generated_schemas.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 api->RegisterSchemaResource("types", IDR_EXTENSION_API_JSON_TYPES); | 265 api->RegisterSchemaResource("types", IDR_EXTENSION_API_JSON_TYPES); |
| 266 api->RegisterSchemaResource("types.private", | 266 api->RegisterSchemaResource("types.private", |
| 267 IDR_EXTENSION_API_JSON_TYPES_PRIVATE); | 267 IDR_EXTENSION_API_JSON_TYPES_PRIVATE); |
| 268 api->RegisterSchemaResource("webstore", IDR_EXTENSION_API_JSON_WEBSTORE); | 268 api->RegisterSchemaResource("webstore", IDR_EXTENSION_API_JSON_WEBSTORE); |
| 269 api->RegisterSchemaResource("webViewRequest", | 269 api->RegisterSchemaResource("webViewRequest", |
| 270 IDR_EXTENSION_API_JSON_WEBVIEW_REQUEST); | 270 IDR_EXTENSION_API_JSON_WEBVIEW_REQUEST); |
| 271 #endif // defined(ENABLE_EXTENSIONS) | 271 #endif // defined(ENABLE_EXTENSIONS) |
| 272 } | 272 } |
| 273 | 273 |
| 274 bool ChromeExtensionsClient::ShouldSuppressFatalErrors() const { | 274 bool ChromeExtensionsClient::ShouldSuppressFatalErrors() const { |
| 275 // <= dev means dev, canary, and trunk. | 275 // Suppress fatal errors only on beta and stable channels. |
| 276 return GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV; | 276 return GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; |
| 277 } | 277 } |
| 278 | 278 |
| 279 // static | 279 // static |
| 280 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() { | 280 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() { |
| 281 return g_client.Pointer(); | 281 return g_client.Pointer(); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } // namespace extensions | 284 } // namespace extensions |
| OLD | NEW |