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

Side by Side Diff: content/renderer/render_view.cc

Issue 7978039: net: Put more functions from escape.h into net namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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
« no previous file with comments | « content/browser/speech/speech_recognition_request.cc ('k') | net/base/escape.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/renderer/render_view.h" 5 #include "content/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 24 matching lines...) Expand all
35 #include "content/common/json_value_serializer.h" 35 #include "content/common/json_value_serializer.h"
36 #include "content/common/notification_service.h" 36 #include "content/common/notification_service.h"
37 #include "content/common/pepper_messages.h" 37 #include "content/common/pepper_messages.h"
38 #include "content/common/pepper_plugin_registry.h" 38 #include "content/common/pepper_plugin_registry.h"
39 #include "content/common/quota_dispatcher.h" 39 #include "content/common/quota_dispatcher.h"
40 #include "content/common/renderer_preferences.h" 40 #include "content/common/renderer_preferences.h"
41 #include "content/common/request_extra_data.h" 41 #include "content/common/request_extra_data.h"
42 #include "content/common/url_constants.h" 42 #include "content/common/url_constants.h"
43 #include "content/common/view_messages.h" 43 #include "content/common/view_messages.h"
44 #include "content/renderer/content_renderer_client.h" 44 #include "content/renderer/content_renderer_client.h"
45 #include "content/renderer/device_orientation_dispatcher.h"
45 #include "content/renderer/devtools_agent.h" 46 #include "content/renderer/devtools_agent.h"
46 #include "content/renderer/device_orientation_dispatcher.h"
47 #include "content/renderer/mhtml_generator.h"
48 #include "content/renderer/external_popup_menu.h" 47 #include "content/renderer/external_popup_menu.h"
49 #include "content/renderer/geolocation_dispatcher.h" 48 #include "content/renderer/geolocation_dispatcher.h"
50 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 49 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
51 #include "content/renderer/intents_dispatcher.h" 50 #include "content/renderer/intents_dispatcher.h"
52 #include "content/renderer/load_progress_tracker.h" 51 #include "content/renderer/load_progress_tracker.h"
53 #include "content/renderer/media/audio_message_filter.h" 52 #include "content/renderer/media/audio_message_filter.h"
54 #include "content/renderer/media/audio_renderer_impl.h" 53 #include "content/renderer/media/audio_renderer_impl.h"
55 #include "content/renderer/media/media_stream_impl.h" 54 #include "content/renderer/media/media_stream_impl.h"
56 #include "content/renderer/media/render_media_log.h" 55 #include "content/renderer/media/render_media_log.h"
56 #include "content/renderer/mhtml_generator.h"
57 #include "content/renderer/navigation_state.h" 57 #include "content/renderer/navigation_state.h"
58 #include "content/renderer/notification_provider.h" 58 #include "content/renderer/notification_provider.h"
59 #include "content/renderer/p2p/socket_dispatcher.h" 59 #include "content/renderer/p2p/socket_dispatcher.h"
60 #include "content/renderer/plugin_channel_host.h" 60 #include "content/renderer/plugin_channel_host.h"
61 #include "content/renderer/render_process.h" 61 #include "content/renderer/render_process.h"
62 #include "content/renderer/render_thread.h" 62 #include "content/renderer/render_thread.h"
63 #include "content/renderer/render_view_observer.h" 63 #include "content/renderer/render_view_observer.h"
64 #include "content/renderer/render_view_visitor.h" 64 #include "content/renderer/render_view_visitor.h"
65 #include "content/renderer/render_widget_fullscreen_pepper.h" 65 #include "content/renderer/render_widget_fullscreen_pepper.h"
66 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 66 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
(...skipping 3107 matching lines...) Expand 10 before | Expand all | Expand 10 after
3174 remove_params.ClearRef(); 3174 remove_params.ClearRef();
3175 const GURL url_to_send = failed_url.ReplaceComponents(remove_params); 3175 const GURL url_to_send = failed_url.ReplaceComponents(remove_params);
3176 std::string spec_to_send = url_to_send.spec(); 3176 std::string spec_to_send = url_to_send.spec();
3177 // Notify link doctor of the url truncation by sending of "?" at the end. 3177 // Notify link doctor of the url truncation by sending of "?" at the end.
3178 if (failed_url.has_query()) 3178 if (failed_url.has_query())
3179 spec_to_send.append("?"); 3179 spec_to_send.append("?");
3180 3180
3181 // Construct the query params to send to link doctor. 3181 // Construct the query params to send to link doctor.
3182 std::string params(alternate_error_page_url_.query()); 3182 std::string params(alternate_error_page_url_.query());
3183 params.append("&url="); 3183 params.append("&url=");
3184 params.append(EscapeQueryParamValue(spec_to_send, true)); 3184 params.append(net::EscapeQueryParamValue(spec_to_send, true));
3185 params.append("&sourceid=chrome"); 3185 params.append("&sourceid=chrome");
3186 params.append("&error="); 3186 params.append("&error=");
3187 switch (error_type) { 3187 switch (error_type) {
3188 case DNS_ERROR: 3188 case DNS_ERROR:
3189 params.append("dnserror"); 3189 params.append("dnserror");
3190 break; 3190 break;
3191 3191
3192 case HTTP_404: 3192 case HTTP_404:
3193 params.append("http404"); 3193 params.append("http404");
3194 break; 3194 break;
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
4627 } 4627 }
4628 4628
4629 void RenderView::OnEnableViewSourceMode() { 4629 void RenderView::OnEnableViewSourceMode() {
4630 if (!webview()) 4630 if (!webview())
4631 return; 4631 return;
4632 WebFrame* main_frame = webview()->mainFrame(); 4632 WebFrame* main_frame = webview()->mainFrame();
4633 if (!main_frame) 4633 if (!main_frame)
4634 return; 4634 return;
4635 main_frame->enableViewSourceMode(true); 4635 main_frame->enableViewSourceMode(true);
4636 } 4636 }
OLDNEW
« no previous file with comments | « content/browser/speech/speech_recognition_request.cc ('k') | net/base/escape.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698