Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 6037013: net: Add namespace net to URLRequestFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 accessibility_controller_.reset(new AccessibilityController(this)); 147 accessibility_controller_.reset(new AccessibilityController(this));
148 delegate_.reset(new TestWebViewDelegate(this)); 148 delegate_.reset(new TestWebViewDelegate(this));
149 popup_delegate_.reset(new TestWebViewDelegate(this)); 149 popup_delegate_.reset(new TestWebViewDelegate(this));
150 layout_test_controller_.reset(new LayoutTestController(this)); 150 layout_test_controller_.reset(new LayoutTestController(this));
151 event_sending_controller_.reset(new EventSendingController(this)); 151 event_sending_controller_.reset(new EventSendingController(this));
152 plain_text_controller_.reset(new PlainTextController(this)); 152 plain_text_controller_.reset(new PlainTextController(this));
153 text_input_controller_.reset(new TextInputController(this)); 153 text_input_controller_.reset(new TextInputController(this));
154 navigation_controller_.reset(new TestNavigationController(this)); 154 navigation_controller_.reset(new TestNavigationController(this));
155 notification_presenter_.reset(new TestNotificationPresenter(this)); 155 notification_presenter_.reset(new TestNotificationPresenter(this));
156 156
157 URLRequestFilter* filter = URLRequestFilter::GetInstance(); 157 net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
158 filter->AddHostnameHandler("test-shell-resource", "inspector", 158 filter->AddHostnameHandler("test-shell-resource", "inspector",
159 &URLRequestTestShellFileJob::InspectorFactory); 159 &URLRequestTestShellFileJob::InspectorFactory);
160 url_util::AddStandardScheme("test-shell-resource"); 160 url_util::AddStandardScheme("test-shell-resource");
161 } 161 }
162 162
163 TestShell::~TestShell() { 163 TestShell::~TestShell() {
164 delegate_->RevokeDragDrop(); 164 delegate_->RevokeDragDrop();
165 165
166 // DevTools frontend page is supposed to be navigated only once and 166 // DevTools frontend page is supposed to be navigated only once and
167 // loading another URL in that Page is an error. 167 // loading another URL in that Page is an error.
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 916 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
917 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 917 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
918 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); 918 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
919 plugins->erase(plugins->begin() + i); 919 plugins->erase(plugins->begin() + i);
920 } 920 }
921 } 921 }
922 } 922 }
923 } 923 }
924 924
925 } // namespace webkit_glue 925 } // namespace webkit_glue
OLDNEW
« net/url_request/url_request_filter.h ('K') | « net/url_request/url_request_filter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698