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

webcontents: replace deprecated navigation observers

Browse source
This commit is contained in:
deepak1556 2016-07-14 05:49:28 +05:30
parent 5d95b544dd
commit c8bf6edcc6
6 changed files with 34 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/renderer/atom_renderer_client.cc
View file

@ -20,7 +20,6 @@
#include "atom/renderer/node_array_buffer_bridge.h"
#include "atom/renderer/preferences_manager.h"
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/renderer/media/chrome_key_systems.h"
#include "chrome/renderer/pepper/pepper_helper.h"
#include "chrome/renderer/printing/print_web_view_helper.h"
@ -32,7 +31,6 @@
#include "content/public/renderer/render_view.h"
#include "ipc/ipc_message_macros.h"
#include "native_mate/dictionary.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/public/web/WebCustomElement.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h"
@ -322,16 +320,4 @@ void AtomRendererClient::AddKeySystems(
AddChromeKeySystems(key_systems);
}
void AtomRendererClient::GetNavigationErrorStrings(
content::RenderFrame* render_frame,
const blink::WebURLRequest& failed_request,
const blink::WebURLError& error,
std::string* error_html,
base::string16* error_description) {
if (!error_description)
return;
*error_description = base::UTF8ToUTF16(net::ErrorToShortString(error.reason));
}
} // namespace atom

5
atom/renderer/atom_renderer_client.h
View file

@ -58,11 +58,6 @@ class AtomRendererClient : public content::ContentRendererClient {
const std::string& mime_type,
const GURL& original_url) override;
void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
void GetNavigationErrorStrings(content::RenderFrame* render_frame,
const blink::WebURLRequest& failed_request,
const blink::WebURLError& error,
std::string* error_html,
base::string16* error_description) override;
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_;