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

Use InspectableWebContentsDelegate.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-04 17:08:30 +08:00
parent c2996d4fd1
commit 5e05a3045c
3 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
browser/native_window.h
View file

@ -16,6 +16,7 @@
#include "content/public/browser/notification_observer.h"
#include "ui/gfx/image/image.h"
#include "vendor/brightray/browser/default_web_contents_delegate.h"
#include "vendor/brightray/browser/inspectable_web_contents_delegate.h"
#include "vendor/brightray/browser/inspectable_web_contents_impl.h"
namespace base {
@ -45,6 +46,7 @@ class DevToolsDelegate;
struct DraggableRegion;
class NativeWindow : public brightray::DefaultWebContentsDelegate,
public brightray::InspectableWebContentsDelegate,
public content::WebContentsObserver,
public content::NotificationObserver {
public:
@ -220,6 +222,11 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
// Implementations of brightray::InspectableWebContentsDelegate.
virtual bool DevToolsSetDockSide(const std::string& dock_side,
bool* succeed) OVERRIDE;
virtual bool DevToolsShow(const std::string& side) OVERRIDE;
// Whether window has standard frame.
bool has_frame_;
@ -232,9 +239,6 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
bool succeed,
const SkBitmap& bitmap);
// Handler for the requestSetDockSide message from devtools.
bool OnRequestSetDockSide(const base::ListValue&);
void OnRendererMessage(const string16& channel,
const base::ListValue& args);