Hook up load error page on Windows.

JuleeAtAdobe · Jun 20, 2012 · ce550e0 · ce550e0
1 parent 675aae1
commit ce550e0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/bin/win/Brackets.exe b/bin/win/Brackets.exe
diff --git a/src/win/cefclient/Resource.h b/src/win/cefclient/Resource.h
@@ -72,6 +72,7 @@
 #define IDS_EXTENSIONPERF               1009
 #define IDS_TRANSPARENCY                1010
 #define IDS_BRACKETS_EXTENSIONS			1011
+#define IDS_BRACKETS_LOAD_ERROR         1012
 
 // Avoid files associated with MacOS
 #define _X86_

diff --git a/src/win/cefclient/cefclient_win.cpp b/src/win/cefclient/cefclient_win.cpp
@@ -404,6 +404,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			pStr++;
 		}
 
+        // Make sure the file exists
+        if (GetFileAttributes(initialUrl) == INVALID_FILE_ATTRIBUTES) {
+            // Load the special "brackets/load_error" url. This will be
+            // redirected to the error page in ClientHandler::OnBeforeResourceLoad().
+            wcscpy(initialUrl, L"http://brackets/load_error");
+        }
+
         // Create the new child browser window
         CefBrowser::CreateBrowser(info,
             static_cast<CefRefPtr<CefClient> >(g_handler),

diff --git a/src/win/cefclient/client_handler_win.cpp b/src/win/cefclient/client_handler_win.cpp
@@ -197,6 +197,13 @@ bool ClientHandler::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
   REQUIRE_IO_THREAD();
 
   std::string url = request->GetURL();
+  if (url == "http://brackets/load_error") {
+    // Show the load error page
+    resourceStream = GetBinaryResourceReader(IDS_BRACKETS_LOAD_ERROR);
+    response->SetMimeType("text/html");
+    response->SetStatus(200);
+  }
+  /*
   if(url == "http://tests/request") {
     // Show the request contents
     std::string dump;
@@ -268,6 +275,7 @@ bool ClientHandler::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,
     response->SetMimeType("text/html");
     response->SetStatus(200);
   }
+  */
 
   return false;
 }