| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
| 6 | 6 |
| 7 #include "app/gfx/gl/gl_implementation.h" | 7 #include "app/gfx/gl/gl_implementation.h" |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/debug_util.h" | 11 #include "base/debug_util.h" |
| 12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/i18n/icu_util.h" | 14 #include "base/i18n/icu_util.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "base/process_util.h" | 18 #include "base/process_util.h" |
| 19 #include "base/string_piece.h" | 19 #include "base/string_piece.h" |
| 20 #include "base/string_util.h" | 20 #include "base/string_util.h" |
| 21 #include "base/stringprintf.h" |
| 21 #include "base/sys_string_conversions.h" | 22 #include "base/sys_string_conversions.h" |
| 22 #include "base/time.h" | 23 #include "base/time.h" |
| 23 #include "base/utf_string_conversions.h" | 24 #include "base/utf_string_conversions.h" |
| 24 #include "base/weak_ptr.h" | 25 #include "base/weak_ptr.h" |
| 25 #include "grit/webkit_chromium_resources.h" | 26 #include "grit/webkit_chromium_resources.h" |
| 26 #include "net/base/escape.h" | 27 #include "net/base/escape.h" |
| 27 #include "net/base/net_errors.h" | 28 #include "net/base/net_errors.h" |
| 28 #include "net/base/net_util.h" | 29 #include "net/base/net_util.h" |
| 29 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
| 30 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 31 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
| (...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 code = 103; | 462 code = 103; |
| 462 break; | 463 break; |
| 463 case net::ERR_ADDRESS_INVALID: | 464 case net::ERR_ADDRESS_INVALID: |
| 464 case net::ERR_ADDRESS_UNREACHABLE: | 465 case net::ERR_ADDRESS_UNREACHABLE: |
| 465 code = -1004; | 466 code = -1004; |
| 466 break; | 467 break; |
| 467 } | 468 } |
| 468 } else | 469 } else |
| 469 DLOG(WARNING) << "Unknown error domain"; | 470 DLOG(WARNING) << "Unknown error domain"; |
| 470 | 471 |
| 471 return StringPrintf("<NSError domain %s, code %d, failing URL \"%s\">", | 472 return base::StringPrintf("<NSError domain %s, code %d, failing URL \"%s\">", |
| 472 domain.c_str(), code, error.unreachableURL.spec().data()); | 473 domain.c_str(), code, error.unreachableURL.spec().data()); |
| 473 } | 474 } |
| 474 | 475 |
| 475 WebKit::WebURLError CreateCancelledError(const WebKit::WebURLRequest& request) { | 476 WebKit::WebURLError CreateCancelledError(const WebKit::WebURLRequest& request) { |
| 476 WebKit::WebURLError error; | 477 WebKit::WebURLError error; |
| 477 error.domain = WebKit::WebString::fromUTF8(net::kErrorDomain); | 478 error.domain = WebKit::WebString::fromUTF8(net::kErrorDomain); |
| 478 error.reason = net::ERR_ABORTED; | 479 error.reason = net::ERR_ABORTED; |
| 479 error.unreachableURL = request.url(); | 480 error.unreachableURL = request.url(); |
| 480 return error; | 481 return error; |
| 481 } | 482 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 if (!webkit_glue::GetExeDirectory(&dirExe)) { | 524 if (!webkit_glue::GetExeDirectory(&dirExe)) { |
| 524 DCHECK(false); | 525 DCHECK(false); |
| 525 return WebURL(); | 526 return WebURL(); |
| 526 } | 527 } |
| 527 FilePath devToolsPath = dirExe.AppendASCII( | 528 FilePath devToolsPath = dirExe.AppendASCII( |
| 528 "resources/inspector/devtools.html"); | 529 "resources/inspector/devtools.html"); |
| 529 return net::FilePathToFileURL(devToolsPath); | 530 return net::FilePathToFileURL(devToolsPath); |
| 530 } | 531 } |
| 531 | 532 |
| 532 } // namespace webkit_support | 533 } // namespace webkit_support |
| OLD | NEW |