mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #238 from deepak1556/devtools_file_input_patch

Browse source 
allow delegate to handle file and color chooser
This commit is contained in:
Cheng Zhao 2016-07-25 16:07:57 +09:00 committed by GitHub
commit f3b85e915d
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -670,6 +670,33 @@ void InspectableWebContentsImpl::CloseContents(content::WebContents* source) {
CloseDevTools(); CloseDevTools();
} }
content::ColorChooser* InspectableWebContentsImpl::OpenColorChooser(
content::WebContents* source,
SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) {
auto delegate = web_contents_->GetDelegate();
if (delegate)
return delegate->OpenColorChooser(source, color, suggestions);
return nullptr;
}
void InspectableWebContentsImpl::RunFileChooser(
content::WebContents* source,
const content::FileChooserParams& params) {
auto delegate = web_contents_->GetDelegate();
if (delegate)
delegate->RunFileChooser(source, params);
}
void InspectableWebContentsImpl::EnumerateDirectory(
content::WebContents* source,
int request_id,
const base::FilePath& path) {
auto delegate = web_contents_->GetDelegate();
if (delegate)
delegate->EnumerateDirectory(source, request_id, path);
}
void InspectableWebContentsImpl::OnWebContentsFocused() { void InspectableWebContentsImpl::OnWebContentsFocused() {
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
if (view_->GetDelegate()) if (view_->GetDelegate())

9
brightray/browser/inspectable_web_contents_impl.h
View file

@ -153,6 +153,15 @@ class InspectableWebContentsImpl :
void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents*, const content::NativeWebKeyboardEvent&) override; content::WebContents*, const content::NativeWebKeyboardEvent&) override;
void CloseContents(content::WebContents* source) override; void CloseContents(content::WebContents* source) override;
content::ColorChooser* OpenColorChooser(
content::WebContents* source,
SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) override;
void RunFileChooser(content::WebContents* source,
const content::FileChooserParams& params) override;
void EnumerateDirectory(content::WebContents* source,
int request_id,
const base::FilePath& path) override;
// net::URLFetcherDelegate: // net::URLFetcherDelegate:
void OnURLFetchComplete(const net::URLFetcher* source) override; void OnURLFetchComplete(const net::URLFetcher* source) override;