Chromium Code Reviews

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: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 715 matching lines...)
726 726
727 WebFileChooserParams params; 727 WebFileChooserParams params;
728 params.multiSelect = fileChooser->settings().allowsMultipleFiles; 728 params.multiSelect = fileChooser->settings().allowsMultipleFiles;
729 params.directory = fileChooser->settings().allowsDirectoryUpload; 729 params.directory = fileChooser->settings().allowsDirectoryUpload;
730 params.acceptTypes = fileChooser->settings().acceptTypes(); 730 params.acceptTypes = fileChooser->settings().acceptTypes();
731 params.selectedFiles = fileChooser->settings().selectedFiles; 731 params.selectedFiles = fileChooser->settings().selectedFiles;
732 if (params.selectedFiles.size() > 0) 732 if (params.selectedFiles.size() > 0)
733 params.initialValue = params.selectedFiles[0]; 733 params.initialValue = params.selectedFiles[0];
734 #if ENABLE(MEDIA_CAPTURE) 734 #if ENABLE(MEDIA_CAPTURE)
735 params.capture = fileChooser->settings().capture; 735 params.capture = fileChooser->settings().capture;
736 #else
737 params.capture = WebString();
738 #endif 736 #endif
739 WebFileChooserCompletionImpl* chooserCompletion = 737 WebFileChooserCompletionImpl* chooserCompletion =
740 new WebFileChooserCompletionImpl(fileChooser); 738 new WebFileChooserCompletionImpl(fileChooser);
741 739
742 if (client->runFileChooser(params, chooserCompletion)) 740 if (client->runFileChooser(params, chooserCompletion))
743 return; 741 return;
744 742
745 // Choosing failed, so do callback with an empty list. 743 // Choosing failed, so do callback with an empty list.
746 chooserCompletion->didChooseFile(WebVector<WebString>()); 744 chooserCompletion->didChooseFile(WebVector<WebString>());
747 } 745 }
(...skipping 364 matching lines...)
1112 { 1110 {
1113 } 1111 }
1114 1112
1115 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) 1113 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title)
1116 { 1114 {
1117 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); 1115 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
1118 } 1116 }
1119 #endif 1117 #endif
1120 1118
1121 } // namespace WebKit 1119 } // namespace WebKit
OLDNEW

Powered by Google App Engine