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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2387 ipc_params.mode = FileChooserParams::Save; | 2387 ipc_params.mode = FileChooserParams::Save; |
2388 else | 2388 else |
2389 ipc_params.mode = FileChooserParams::Open; | 2389 ipc_params.mode = FileChooserParams::Open; |
2390 ipc_params.title = params.title; | 2390 ipc_params.title = params.title; |
2391 ipc_params.default_file_name = | 2391 ipc_params.default_file_name = |
2392 base::FilePath::FromUTF16Unsafe(params.initialValue); | 2392 base::FilePath::FromUTF16Unsafe(params.initialValue); |
2393 ipc_params.accept_types.reserve(params.acceptTypes.size()); | 2393 ipc_params.accept_types.reserve(params.acceptTypes.size()); |
2394 for (size_t i = 0; i < params.acceptTypes.size(); ++i) | 2394 for (size_t i = 0; i < params.acceptTypes.size(); ++i) |
2395 ipc_params.accept_types.push_back(params.acceptTypes[i]); | 2395 ipc_params.accept_types.push_back(params.acceptTypes[i]); |
2396 #if defined(OS_ANDROID) | 2396 #if defined(OS_ANDROID) |
2397 ipc_params.capture = params.capture; | 2397 ipc_params.capture = params.mediaCaptureEnabled; |
2398 #endif | 2398 #endif |
2399 | 2399 |
2400 return ScheduleFileChooser(ipc_params, chooser_completion); | 2400 return ScheduleFileChooser(ipc_params, chooser_completion); |
2401 } | 2401 } |
2402 | 2402 |
2403 void RenderViewImpl::runModalAlertDialog(WebFrame* frame, | 2403 void RenderViewImpl::runModalAlertDialog(WebFrame* frame, |
2404 const WebString& message) { | 2404 const WebString& message) { |
2405 RunJavaScriptMessage(JAVASCRIPT_MESSAGE_TYPE_ALERT, | 2405 RunJavaScriptMessage(JAVASCRIPT_MESSAGE_TYPE_ALERT, |
2406 message, | 2406 message, |
2407 string16(), | 2407 string16(), |
(...skipping 4376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6784 WebURL url = icon_urls[i].iconURL(); | 6784 WebURL url = icon_urls[i].iconURL(); |
6785 if (!url.isEmpty()) | 6785 if (!url.isEmpty()) |
6786 urls.push_back(FaviconURL(url, | 6786 urls.push_back(FaviconURL(url, |
6787 ToFaviconType(icon_urls[i].iconType()))); | 6787 ToFaviconType(icon_urls[i].iconType()))); |
6788 } | 6788 } |
6789 SendUpdateFaviconURL(urls); | 6789 SendUpdateFaviconURL(urls); |
6790 } | 6790 } |
6791 | 6791 |
6792 | 6792 |
6793 } // namespace content | 6793 } // namespace content |
OLD | NEW |