Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: content/browser/devtools/protocol/page_handler.h

Issue 1043173003: [DevTools] Move Page and Emulation handlers to RenderFrameHostImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix non-debug-devtools compilation Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/page_handler.h
diff --git a/content/browser/devtools/protocol/page_handler.h b/content/browser/devtools/protocol/page_handler.h
index 57494396d2368117cbbd07b3fe5cd76d7492cc8b..fff0cda58ecc00f371376fd8845a893e9e91218b 100644
--- a/content/browser/devtools/protocol/page_handler.h
+++ b/content/browser/devtools/protocol/page_handler.h
@@ -11,20 +11,23 @@
#include "base/time/time.h"
#include "cc/output/compositor_frame_metadata.h"
#include "content/browser/devtools/protocol/devtools_protocol_handler.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/readback_types.h"
class SkBitmap;
namespace content {
-class RenderViewHostImpl;
+class RenderFrameHostImpl;
+class WebContentsImpl;
namespace devtools {
namespace page {
class ColorPicker;
-class PageHandler {
+class PageHandler : public NotificationObserver {
public:
typedef DevToolsProtocolClient::Response Response;
@@ -35,13 +38,12 @@ class PageHandler {
};
PageHandler();
- virtual ~PageHandler();
+ ~PageHandler() override;
- void SetRenderViewHost(RenderViewHostImpl* host);
+ void SetRenderFrameHost(RenderFrameHostImpl* host);
void SetClient(scoped_ptr<Client> client);
void Detached();
void OnSwapCompositorFrame(const cc::CompositorFrameMetadata& frame_metadata);
- void OnVisibilityChanged(bool visible);
void DidAttachInterstitialPage();
void DidDetachInterstitialPage();
void SetScreencastListener(ScreencastListener* listener);
@@ -80,6 +82,7 @@ class PageHandler {
Response SetColorPickerEnabled(bool enabled);
private:
+ WebContentsImpl* GetWebContents();
void NotifyScreencastVisibility(bool visible);
void InnerSwapCompositorFrame();
void ScreencastFrameCaptured(const cc::CompositorFrameMetadata& metadata,
@@ -96,6 +99,11 @@ class PageHandler {
void OnColorPicked(int r, int g, int b, int a);
+ // NotificationObserver overrides.
+ void Observe(int type,
+ const NotificationSource& source,
+ const NotificationDetails& details) override;
+
bool enabled_;
bool screencast_enabled_;
@@ -113,9 +121,10 @@ class PageHandler {
scoped_ptr<ColorPicker> color_picker_;
- RenderViewHostImpl* host_;
+ RenderFrameHostImpl* host_;
scoped_ptr<Client> client_;
ScreencastListener* screencast_listener_;
+ NotificationRegistrar registrar_;
base::WeakPtrFactory<PageHandler> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(PageHandler);
« no previous file with comments | « content/browser/devtools/protocol/emulation_handler.cc ('k') | content/browser/devtools/protocol/page_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698