| 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 #undef LOG | 5 #undef LOG |
| 6 | 6 |
| 7 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 event_sending_controller_.reset(new EventSendingController(this)); | 146 event_sending_controller_.reset(new EventSendingController(this)); |
| 147 plain_text_controller_.reset(new PlainTextController(this)); | 147 plain_text_controller_.reset(new PlainTextController(this)); |
| 148 text_input_controller_.reset(new TextInputController(this)); | 148 text_input_controller_.reset(new TextInputController(this)); |
| 149 navigation_controller_.reset(new TestNavigationController(this)); | 149 navigation_controller_.reset(new TestNavigationController(this)); |
| 150 notification_presenter_.reset(new TestNotificationPresenter(this)); | 150 notification_presenter_.reset(new TestNotificationPresenter(this)); |
| 151 | 151 |
| 152 URLRequestFilter* filter = URLRequestFilter::GetInstance(); | 152 URLRequestFilter* filter = URLRequestFilter::GetInstance(); |
| 153 filter->AddHostnameHandler("test-shell-resource", "inspector", | 153 filter->AddHostnameHandler("test-shell-resource", "inspector", |
| 154 &URLRequestTestShellFileJob::InspectorFactory); | 154 &URLRequestTestShellFileJob::InspectorFactory); |
| 155 url_util::AddStandardScheme("test-shell-resource"); | 155 url_util::AddStandardScheme("test-shell-resource"); |
| 156 | |
| 157 if (!file_system_root_.CreateUniqueTempDir()) { | |
| 158 LOG(WARNING) << "Failed to create a temp dir for the filesystem." | |
| 159 "FileSystem feature will be disabled."; | |
| 160 DCHECK(file_system_root_.path().empty()); | |
| 161 } | |
| 162 } | 156 } |
| 163 | 157 |
| 164 TestShell::~TestShell() { | 158 TestShell::~TestShell() { |
| 165 delegate_->RevokeDragDrop(); | 159 delegate_->RevokeDragDrop(); |
| 166 | 160 |
| 167 // DevTools frontend page is supposed to be navigated only once and | 161 // DevTools frontend page is supposed to be navigated only once and |
| 168 // loading another URL in that Page is an error. | 162 // loading another URL in that Page is an error. |
| 169 if (!dev_tools_client_.get()) { | 163 if (!dev_tools_client_.get()) { |
| 170 // Navigate to an empty page to fire all the destruction logic for the | 164 // Navigate to an empty page to fire all the destruction logic for the |
| 171 // current page. | 165 // current page. |
| (...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 908 NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 902 NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
| 909 plugins->erase(plugins->begin() + i); | 903 plugins->erase(plugins->begin() + i); |
| 910 } | 904 } |
| 911 #endif | 905 #endif |
| 912 } | 906 } |
| 913 } | 907 } |
| 914 } | 908 } |
| 915 } | 909 } |
| 916 | 910 |
| 917 } // namespace webkit_glue | 911 } // namespace webkit_glue |
| OLD | NEW |