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

Side by Side Diff: chrome/renderer/resources/extensions/last_error.js

Issue 306893003: Fix channel check for fatal error suppression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove CHECK in IsAvailable Created 6 years, 6 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 | Annotate | Revision Log
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 var GetAvailability = requireNative('v8_context').GetAvailability; 5 var GetAvailability = requireNative('v8_context').GetAvailability;
6 var GetGlobal = requireNative('sendRequest').GetGlobal; 6 var GetGlobal = requireNative('sendRequest').GetGlobal;
7 7
8 // Utility for setting chrome.*.lastError. 8 // Utility for setting chrome.*.lastError.
9 // 9 //
10 // A utility here is useful for two reasons: 10 // A utility here is useful for two reasons:
(...skipping 10 matching lines...) Expand all
21 function set(name, message, stack, targetChrome) { 21 function set(name, message, stack, targetChrome) {
22 var errorMessage = name + ': ' + message; 22 var errorMessage = name + ': ' + message;
23 if (stack != null && stack != '') 23 if (stack != null && stack != '')
24 errorMessage += '\n' + stack; 24 errorMessage += '\n' + stack;
25 25
26 if (!targetChrome) 26 if (!targetChrome)
27 throw new Error('No chrome object to set error: ' + errorMessage); 27 throw new Error('No chrome object to set error: ' + errorMessage);
28 clear(targetChrome); // in case somebody has set a sneaky getter/setter 28 clear(targetChrome); // in case somebody has set a sneaky getter/setter
29 29
30 var errorObject = { message: message }; 30 var errorObject = { message: message };
31 if (targetChrome && targetChrome.extension) 31 if (GetAvailability('extension.lastError').is_available)
32 targetChrome.extension.lastError = errorObject; 32 targetChrome.extension.lastError = errorObject;
33 33
34 assertRuntimeIsAvailable(); 34 assertRuntimeIsAvailable();
35 35
36 // We check to see if developers access runtime.lastError in order to decide 36 // We check to see if developers access runtime.lastError in order to decide
37 // whether or not to log it in the (error) console. 37 // whether or not to log it in the (error) console.
38 privates(targetChrome.runtime).accessedLastError = false; 38 privates(targetChrome.runtime).accessedLastError = false;
39 $Object.defineProperty(targetChrome.runtime, 'lastError', { 39 $Object.defineProperty(targetChrome.runtime, 'lastError', {
40 configurable: true, 40 configurable: true,
41 get: function() { 41 get: function() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 return false; 74 return false;
75 }; 75 };
76 76
77 /** 77 /**
78 * Clears the last error on |targetChrome|. 78 * Clears the last error on |targetChrome|.
79 */ 79 */
80 function clear(targetChrome) { 80 function clear(targetChrome) {
81 if (!targetChrome) 81 if (!targetChrome)
82 throw new Error('No target chrome to clear error'); 82 throw new Error('No target chrome to clear error');
83 83
84 if (targetChrome && targetChrome.extension) 84 if (GetAvailability('extension.lastError').is_available)
85 delete targetChrome.extension.lastError; 85 delete targetChrome.extension.lastError;
86 86
87 assertRuntimeIsAvailable(); 87 assertRuntimeIsAvailable();
88 delete targetChrome.runtime.lastError; 88 delete targetChrome.runtime.lastError;
89 delete privates(targetChrome.runtime).accessedLastError; 89 delete privates(targetChrome.runtime).accessedLastError;
90 }; 90 };
91 91
92 function assertRuntimeIsAvailable() { 92 function assertRuntimeIsAvailable() {
93 // chrome.runtime should always be available, but maybe it's disappeared for 93 // chrome.runtime should always be available, but maybe it's disappeared for
94 // some reason? Add debugging for http://crbug.com/258526. 94 // some reason? Add debugging for http://crbug.com/258526.
(...skipping 20 matching lines...) Expand all
115 } finally { 115 } finally {
116 clear(targetChrome); 116 clear(targetChrome);
117 } 117 }
118 } 118 }
119 119
120 exports.clear = clear; 120 exports.clear = clear;
121 exports.hasAccessed = hasAccessed; 121 exports.hasAccessed = hasAccessed;
122 exports.hasError = hasError; 122 exports.hasError = hasError;
123 exports.set = set; 123 exports.set = set;
124 exports.run = run; 124 exports.run = run;
OLDNEW
« no previous file with comments | « chrome/common/extensions/chrome_extensions_client.cc ('k') | extensions/common/extension_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698