OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_impl.h" | 5 #include "content/renderer/render_view_impl.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "content/common/request_extra_data.h" | 42 #include "content/common/request_extra_data.h" |
43 #include "content/common/socket_stream_handle_data.h" | 43 #include "content/common/socket_stream_handle_data.h" |
44 #include "content/common/view_messages.h" | 44 #include "content/common/view_messages.h" |
45 #include "content/common/webmessageportchannel_impl.h" | 45 #include "content/common/webmessageportchannel_impl.h" |
46 #include "content/public/common/bindings_policy.h" | 46 #include "content/public/common/bindings_policy.h" |
47 #include "content/public/common/content_client.h" | 47 #include "content/public/common/content_client.h" |
48 #include "content/public/common/content_constants.h" | 48 #include "content/public/common/content_constants.h" |
49 #include "content/public/common/content_switches.h" | 49 #include "content/public/common/content_switches.h" |
50 #include "content/public/common/context_menu_params.h" | 50 #include "content/public/common/context_menu_params.h" |
51 #include "content/public/common/file_chooser_params.h" | 51 #include "content/public/common/file_chooser_params.h" |
52 #include "content/public/common/selected_file_info.h" | |
53 #include "content/public/common/url_constants.h" | 52 #include "content/public/common/url_constants.h" |
54 #include "content/public/renderer/content_renderer_client.h" | 53 #include "content/public/renderer/content_renderer_client.h" |
55 #include "content/public/renderer/document_state.h" | 54 #include "content/public/renderer/document_state.h" |
56 #include "content/public/renderer/navigation_state.h" | 55 #include "content/public/renderer/navigation_state.h" |
57 #include "content/public/renderer/render_view_observer.h" | 56 #include "content/public/renderer/render_view_observer.h" |
58 #include "content/public/renderer/render_view_visitor.h" | 57 #include "content/public/renderer/render_view_visitor.h" |
59 #include "content/renderer/browser_plugin/old/browser_plugin.h" | 58 #include "content/renderer/browser_plugin/old/browser_plugin.h" |
60 #include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h" | 59 #include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h" |
61 #include "content/renderer/browser_plugin/old/browser_plugin_constants.h" | 60 #include "content/renderer/browser_plugin/old/browser_plugin_constants.h" |
62 #include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h" | 61 #include "content/renderer/browser_plugin/old/guest_to_embedder_channel.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize
dScriptValue.h" | 155 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerialize
dScriptValue.h" |
157 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" | 156 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
158 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStr
eamHandle.h" | 157 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStr
eamHandle.h" |
159 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 158 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
160 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" | 159 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
161 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" | 160 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" |
162 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" | 161 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques
t.h" |
163 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon
se.h" | 162 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon
se.h" |
164 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" | 163 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
165 #include "third_party/skia/include/core/SkBitmap.h" | 164 #include "third_party/skia/include/core/SkBitmap.h" |
| 165 #include "ui/base/dialogs/selected_file_info.h" |
166 #include "ui/gfx/native_widget_types.h" | 166 #include "ui/gfx/native_widget_types.h" |
167 #include "ui/gfx/point.h" | 167 #include "ui/gfx/point.h" |
168 #include "ui/gfx/rect.h" | 168 #include "ui/gfx/rect.h" |
169 #include "v8/include/v8.h" | 169 #include "v8/include/v8.h" |
170 #include "webkit/appcache/web_application_cache_host_impl.h" | 170 #include "webkit/appcache/web_application_cache_host_impl.h" |
171 #include "webkit/dom_storage/dom_storage_types.h" | 171 #include "webkit/dom_storage/dom_storage_types.h" |
172 #include "webkit/forms/form_data.h" | 172 #include "webkit/forms/form_data.h" |
173 #include "webkit/forms/form_field.h" | 173 #include "webkit/forms/form_field.h" |
174 #include "webkit/forms/password_form_dom_manager.h" | 174 #include "webkit/forms/password_form_dom_manager.h" |
175 #include "webkit/glue/alt_error_page_resource_fetcher.h" | 175 #include "webkit/glue/alt_error_page_resource_fetcher.h" |
(...skipping 4420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4596 | 4596 |
4597 WebVector<WebString> ws_file_names(paths.size()); | 4597 WebVector<WebString> ws_file_names(paths.size()); |
4598 for (size_t i = 0; i < paths.size(); ++i) | 4598 for (size_t i = 0; i < paths.size(); ++i) |
4599 ws_file_names[i] = webkit_glue::FilePathToWebString(paths[i]); | 4599 ws_file_names[i] = webkit_glue::FilePathToWebString(paths[i]); |
4600 | 4600 |
4601 enumeration_completions_[id]->didChooseFile(ws_file_names); | 4601 enumeration_completions_[id]->didChooseFile(ws_file_names); |
4602 enumeration_completions_.erase(id); | 4602 enumeration_completions_.erase(id); |
4603 } | 4603 } |
4604 | 4604 |
4605 void RenderViewImpl::OnFileChooserResponse( | 4605 void RenderViewImpl::OnFileChooserResponse( |
4606 const std::vector<content::SelectedFileInfo>& files) { | 4606 const std::vector<ui::SelectedFileInfo>& files) { |
4607 // This could happen if we navigated to a different page before the user | 4607 // This could happen if we navigated to a different page before the user |
4608 // closed the chooser. | 4608 // closed the chooser. |
4609 if (file_chooser_completions_.empty()) | 4609 if (file_chooser_completions_.empty()) |
4610 return; | 4610 return; |
4611 | 4611 |
4612 // Convert Chrome's SelectedFileInfo list to WebKit's. | 4612 // Convert Chrome's SelectedFileInfo list to WebKit's. |
4613 WebVector<WebFileChooserCompletion::SelectedFileInfo> selected_files( | 4613 WebVector<WebFileChooserCompletion::SelectedFileInfo> selected_files( |
4614 files.size()); | 4614 files.size()); |
4615 for (size_t i = 0; i < files.size(); ++i) { | 4615 for (size_t i = 0; i < files.size(); ++i) { |
4616 WebFileChooserCompletion::SelectedFileInfo selected_file; | 4616 WebFileChooserCompletion::SelectedFileInfo selected_file; |
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5683 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5683 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5684 return !!RenderThreadImpl::current()->compositor_thread(); | 5684 return !!RenderThreadImpl::current()->compositor_thread(); |
5685 } | 5685 } |
5686 | 5686 |
5687 void RenderViewImpl::OnJavaBridgeInit() { | 5687 void RenderViewImpl::OnJavaBridgeInit() { |
5688 DCHECK(!java_bridge_dispatcher_); | 5688 DCHECK(!java_bridge_dispatcher_); |
5689 #if defined(ENABLE_JAVA_BRIDGE) | 5689 #if defined(ENABLE_JAVA_BRIDGE) |
5690 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5690 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5691 #endif | 5691 #endif |
5692 } | 5692 } |
OLD | NEW |