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

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

Issue 14758008: Update the HTML Media Capture implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix attempt. Created 7 years, 5 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
OLDNEW
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 2381 matching lines...) Expand 10 before | Expand all | Expand 10 after
2392 ipc_params.mode = FileChooserParams::Save; 2392 ipc_params.mode = FileChooserParams::Save;
2393 else 2393 else
2394 ipc_params.mode = FileChooserParams::Open; 2394 ipc_params.mode = FileChooserParams::Open;
2395 ipc_params.title = params.title; 2395 ipc_params.title = params.title;
2396 ipc_params.default_file_name = 2396 ipc_params.default_file_name =
2397 base::FilePath::FromUTF16Unsafe(params.initialValue); 2397 base::FilePath::FromUTF16Unsafe(params.initialValue);
2398 ipc_params.accept_types.reserve(params.acceptTypes.size()); 2398 ipc_params.accept_types.reserve(params.acceptTypes.size());
2399 for (size_t i = 0; i < params.acceptTypes.size(); ++i) 2399 for (size_t i = 0; i < params.acceptTypes.size(); ++i)
2400 ipc_params.accept_types.push_back(params.acceptTypes[i]); 2400 ipc_params.accept_types.push_back(params.acceptTypes[i]);
2401 #if defined(OS_ANDROID) 2401 #if defined(OS_ANDROID)
2402 ipc_params.capture = params.capture; 2402 ipc_params.capture = params.useMediaCapture;
2403 #endif 2403 #endif
2404 2404
2405 return ScheduleFileChooser(ipc_params, chooser_completion); 2405 return ScheduleFileChooser(ipc_params, chooser_completion);
2406 } 2406 }
2407 2407
2408 void RenderViewImpl::runModalAlertDialog(WebFrame* frame, 2408 void RenderViewImpl::runModalAlertDialog(WebFrame* frame,
2409 const WebString& message) { 2409 const WebString& message) {
2410 RunJavaScriptMessage(JAVASCRIPT_MESSAGE_TYPE_ALERT, 2410 RunJavaScriptMessage(JAVASCRIPT_MESSAGE_TYPE_ALERT,
2411 message, 2411 message,
2412 string16(), 2412 string16(),
(...skipping 4376 matching lines...) Expand 10 before | Expand all | Expand 10 after
6789 WebURL url = icon_urls[i].iconURL(); 6789 WebURL url = icon_urls[i].iconURL();
6790 if (!url.isEmpty()) 6790 if (!url.isEmpty())
6791 urls.push_back(FaviconURL(url, 6791 urls.push_back(FaviconURL(url,
6792 ToFaviconType(icon_urls[i].iconType()))); 6792 ToFaviconType(icon_urls[i].iconType())));
6793 } 6793 }
6794 SendUpdateFaviconURL(urls); 6794 SendUpdateFaviconURL(urls);
6795 } 6795 }
6796 6796
6797 6797
6798 } // namespace content 6798 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/file_chooser_params.h ('k') | ui/android/java/src/org/chromium/ui/SelectFileDialog.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698