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

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

Issue 18332015: HTML Media Capture: Update implementation, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@update-media-capture-implementation-part1
Patch Set: Rebase 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 /* 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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 return; 642 return;
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;
653 params.useMediaCapture = fileChooser->settings().useMediaCapture; 652 params.useMediaCapture = fileChooser->settings().useMediaCapture;
654 #else
655 params.capture = WebString();
656 params.useMediaCapture = false;
657 #endif 653 #endif
658 WebFileChooserCompletionImpl* chooserCompletion = 654 WebFileChooserCompletionImpl* chooserCompletion =
659 new WebFileChooserCompletionImpl(fileChooser); 655 new WebFileChooserCompletionImpl(fileChooser);
660 656
661 if (client->runFileChooser(params, chooserCompletion)) 657 if (client->runFileChooser(params, chooserCompletion))
662 return; 658 return;
663 659
664 // Choosing failed, so do callback with an empty list. 660 // Choosing failed, so do callback with an empty list.
665 chooserCompletion->didChooseFile(WebVector<WebString>()); 661 chooserCompletion->didChooseFile(WebVector<WebString>());
666 } 662 }
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 { 1023 {
1028 } 1024 }
1029 1025
1030 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) 1026 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title)
1031 { 1027 {
1032 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); 1028 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
1033 } 1029 }
1034 #endif 1030 #endif
1035 1031
1036 } // namespace WebKit 1032 } // namespace WebKit
OLDNEW
« no previous file with comments | « LayoutTests/fast/forms/file/file-input-capture-expected.txt ('k') | Source/core/html/FileInputType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698