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

Side by Side Diff: Source/WebKit/chromium/src/ChromeClientImpl.cpp

Issue 15015006: HTML Media Capture: Update implementation, part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Minor fix 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
« no previous file with comments | « no previous file | Source/core/html/FileInputType.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 643
644 WebFileChooserParams params; 644 WebFileChooserParams params;
645 params.multiSelect = fileChooser->settings().allowsMultipleFiles; 645 params.multiSelect = fileChooser->settings().allowsMultipleFiles;
646 params.directory = fileChooser->settings().allowsDirectoryUpload; 646 params.directory = fileChooser->settings().allowsDirectoryUpload;
647 params.acceptTypes = fileChooser->settings().acceptTypes(); 647 params.acceptTypes = fileChooser->settings().acceptTypes();
648 params.selectedFiles = fileChooser->settings().selectedFiles; 648 params.selectedFiles = fileChooser->settings().selectedFiles;
649 if (params.selectedFiles.size() > 0) 649 if (params.selectedFiles.size() > 0)
650 params.initialValue = params.selectedFiles[0]; 650 params.initialValue = params.selectedFiles[0];
651 #if ENABLE(MEDIA_CAPTURE) 651 #if ENABLE(MEDIA_CAPTURE)
652 params.capture = fileChooser->settings().capture; 652 params.capture = fileChooser->settings().capture;
653 params.useMediaCapture = fileChooser->settings().useMediaCapture;
653 #else 654 #else
654 params.capture = WebString(); 655 params.capture = WebString();
656 params.useMediaCapture = false;
655 #endif 657 #endif
656 WebFileChooserCompletionImpl* chooserCompletion = 658 WebFileChooserCompletionImpl* chooserCompletion =
657 new WebFileChooserCompletionImpl(fileChooser); 659 new WebFileChooserCompletionImpl(fileChooser);
658 660
659 if (client->runFileChooser(params, chooserCompletion)) 661 if (client->runFileChooser(params, chooserCompletion))
660 return; 662 return;
661 663
662 // Choosing failed, so do callback with an empty list. 664 // Choosing failed, so do callback with an empty list.
663 chooserCompletion->didChooseFile(WebVector<WebString>()); 665 chooserCompletion->didChooseFile(WebVector<WebString>());
664 } 666 }
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 { 1027 {
1026 } 1028 }
1027 1029
1028 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) 1030 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title)
1029 { 1031 {
1030 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); 1032 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
1031 } 1033 }
1032 #endif 1034 #endif
1033 1035
1034 } // namespace WebKit 1036 } // namespace WebKit
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/FileInputType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698