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

Update InspectableWebContentsImpl

Browse source
This commit is contained in:
Cheng Zhao 2017-01-23 15:27:57 +09:00
parent db7959619e
commit 622fd8d1d7
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -144,7 +144,7 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
int Write(net::IOBuffer* buffer, int Write(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
int Finish(const net::CompletionCallback& callback) override; int Finish(int net_error, const net::CompletionCallback& callback) override;
private: private:
base::WeakPtr<InspectableWebContentsImpl> bindings_; base::WeakPtr<InspectableWebContentsImpl> bindings_;
@ -181,7 +181,8 @@ int ResponseWriter::Write(net::IOBuffer* buffer,
return num_bytes; return num_bytes;
} }
int ResponseWriter::Finish(const net::CompletionCallback& callback) { int ResponseWriter::Finish(int net_error,
const net::CompletionCallback& callback) {
return net::OK; return net::OK;
} }
@ -654,7 +655,7 @@ void InspectableWebContentsImpl::WebContentsDestroyed() {
view_->GetDelegate()->DevToolsClosed(); view_->GetDelegate()->DevToolsClosed();
} }
bool InspectableWebContentsImpl::AddMessageToConsole( bool InspectableWebContentsImpl::DidAddMessageToConsole(
content::WebContents* source, content::WebContents* source,
int32_t level, int32_t level,
const base::string16& message, const base::string16& message,
@ -726,7 +727,7 @@ void InspectableWebContentsImpl::OnWebContentsFocused() {
void InspectableWebContentsImpl::DidStartNavigationToPendingEntry( void InspectableWebContentsImpl::DidStartNavigationToPendingEntry(
const GURL& url, const GURL& url,
content::NavigationController::ReloadType reload_type) { content::ReloadType reload_type) {
frontend_host_.reset( frontend_host_.reset(
content::DevToolsFrontendHost::Create( content::DevToolsFrontendHost::Create(
web_contents()->GetMainFrame(), web_contents()->GetMainFrame(),

12
brightray/browser/inspectable_web_contents_impl.h
View file

@ -133,14 +133,14 @@ class InspectableWebContentsImpl :
void OnWebContentsFocused() override; void OnWebContentsFocused() override;
void DidStartNavigationToPendingEntry( void DidStartNavigationToPendingEntry(
const GURL& url, const GURL& url,
content::NavigationController::ReloadType reload_type) override; content::ReloadType reload_type) override;
// content::WebContentsDelegate: // content::WebContentsDelegate:
bool AddMessageToConsole(content::WebContents* source, bool DidAddMessageToConsole(content::WebContents* source,
int32_t level, int32_t level,
const base::string16& message, const base::string16& message,
int32_t line_no, int32_t line_no,
const base::string16& source_id) override; const base::string16& source_id) override;
bool ShouldCreateWebContents( bool ShouldCreateWebContents(
content::WebContents* web_contents, content::WebContents* web_contents,
int32_t route_id, int32_t route_id,