Emit erros when getting errors in IO thread.

gischen · Sep 3, 2013 · c7fed48 · c7fed48
1 parent 7737708
commit c7fed48
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/browser/api/atom_api_protocol.cc b/browser/api/atom_api_protocol.cc
@@ -293,6 +293,16 @@ void Protocol::InterceptProtocolInIO(const std::string& scheme) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   AtomURLRequestJobFactory* job_factory(GetRequestJobFactory());
   ProtocolHandler* original_handler = job_factory->GetProtocolHandler(scheme);
+  if (original_handler == NULL) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&EmitEventInUI,
+                   "error",
+                   "There is no protocol handler to intercpet"));
+    return;
+  }
+
   job_factory->ReplaceProtocol(scheme,
                                new CustomProtocolHandler(original_handler));
 
@@ -311,8 +321,15 @@ void Protocol::UninterceptProtocolInIO(const std::string& scheme) {
   // Check if the protocol handler is intercepted.
   CustomProtocolHandler* handler = static_cast<CustomProtocolHandler*>(
       job_factory->GetProtocolHandler(scheme));
-  if (!handler->original_handler())
+  if (handler->original_handler() == NULL) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&EmitEventInUI,
+                   "error",
+                   "The protocol is not intercpeted"));
     return;
+  }
 
   // Reset the protocol handler to the orignal one and delete current
   // protocol handler.