OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/tools/test_shell/test_shell.h" | 5 #include "webkit/tools/test_shell/test_shell.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug_on_start.h" | 8 #include "base/debug_on_start.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 public: | 90 public: |
91 virtual ~URLRequestTestShellFileJob() { } | 91 virtual ~URLRequestTestShellFileJob() { } |
92 | 92 |
93 static URLRequestJob* InspectorFactory(URLRequest* request, | 93 static URLRequestJob* InspectorFactory(URLRequest* request, |
94 const std::string& scheme) { | 94 const std::string& scheme) { |
95 std::wstring path; | 95 std::wstring path; |
96 PathService::Get(base::DIR_EXE, &path); | 96 PathService::Get(base::DIR_EXE, &path); |
97 file_util::AppendToPath(&path, L"Resources"); | 97 file_util::AppendToPath(&path, L"Resources"); |
98 file_util::AppendToPath(&path, L"Inspector"); | 98 file_util::AppendToPath(&path, L"Inspector"); |
99 file_util::AppendToPath(&path, UTF8ToWide(request->url().path())); | 99 file_util::AppendToPath(&path, UTF8ToWide(request->url().path())); |
100 return new URLRequestTestShellFileJob(request, path); | 100 return new URLRequestTestShellFileJob(request, |
| 101 FilePath::FromWStringHack(path)); |
101 } | 102 } |
102 | 103 |
103 private: | 104 private: |
104 URLRequestTestShellFileJob(URLRequest* request, const std::wstring& path) | 105 URLRequestTestShellFileJob(URLRequest* request, const FilePath& path) |
105 : URLRequestFileJob(request) { | 106 : URLRequestFileJob(request, path) { |
106 this->file_path_ = FilePath::FromWStringHack(path); | |
107 } | 107 } |
108 | 108 |
109 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob); | 109 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob); |
110 }; | 110 }; |
111 | 111 |
112 } // namespace | 112 } // namespace |
113 | 113 |
114 // Initialize static member variable | 114 // Initialize static member variable |
115 WindowList* TestShell::window_list_; | 115 WindowList* TestShell::window_list_; |
116 WebPreferences* TestShell::web_prefs_ = NULL; | 116 WebPreferences* TestShell::web_prefs_ = NULL; |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 | 594 |
595 uint64 VisitedLinkHash(const char* canonical_url, size_t length) { | 595 uint64 VisitedLinkHash(const char* canonical_url, size_t length) { |
596 return 0; | 596 return 0; |
597 } | 597 } |
598 | 598 |
599 bool IsLinkVisited(uint64 link_hash) { | 599 bool IsLinkVisited(uint64 link_hash) { |
600 return false; | 600 return false; |
601 } | 601 } |
602 | 602 |
603 } // namespace webkit_glue | 603 } // namespace webkit_glue |
OLD | NEW |