summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_renderer.gypi2
-rw-r--r--chrome/common/render_messages.h4
-rw-r--r--chrome/renderer/chrome_render_view_observer.cc8
-rw-r--r--chrome/renderer/chrome_render_view_observer.h1
-rw-r--r--chrome/renderer/frame_sniffer.cc37
-rw-r--r--chrome/renderer/frame_sniffer.h35
6 files changed, 0 insertions, 87 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index dd16c6a..a25bdcf 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -160,8 +160,6 @@
'renderer/extensions/v8_schema_registry.h',
'renderer/extensions/webstore_bindings.cc',
'renderer/extensions/webstore_bindings.h',
- 'renderer/frame_sniffer.cc',
- 'renderer/frame_sniffer.h',
'renderer/isolated_world_ids.h',
'renderer/loadtimes_extension_bindings.cc',
'renderer/loadtimes_extension_bindings.h',
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index a601a75..090cad7 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -376,10 +376,6 @@ IPC_MESSAGE_ROUTED1(ChromeViewMsg_AddStrictSecurityHost,
IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetClientSidePhishingDetection,
bool /* enable_phishing_detection */)
-// This message asks frame sniffer start.
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_StartFrameSniffer,
- string16 /* frame-name */)
-
// Asks the renderer for a thumbnail of the image selected by the most
// recently opened context menu, if there is one. If the image's area
// is greater than thumbnail_min_area it will be downscaled to
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index ab3676d..6fcdf2a 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -22,7 +22,6 @@
#include "chrome/renderer/content_settings_observer.h"
#include "chrome/renderer/extensions/dispatcher.h"
#include "chrome/renderer/external_host_bindings.h"
-#include "chrome/renderer/frame_sniffer.h"
#include "chrome/renderer/prerender/prerender_helper.h"
#include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
#include "chrome/renderer/translate/translate_helper.h"
@@ -312,9 +311,6 @@ bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
OnSetVisuallyDeemphasized)
IPC_MESSAGE_HANDLER(ChromeViewMsg_RequestThumbnailForContextNode,
OnRequestThumbnailForContextNode)
-#if defined(OS_CHROMEOS)
- IPC_MESSAGE_HANDLER(ChromeViewMsg_StartFrameSniffer, OnStartFrameSniffer)
-#endif
IPC_MESSAGE_HANDLER(ChromeViewMsg_GetFPS, OnGetFPS)
IPC_MESSAGE_HANDLER(ChromeViewMsg_AddStrictSecurityHost,
OnAddStrictSecurityHost)
@@ -515,10 +511,6 @@ void ChromeRenderViewObserver::OnRequestThumbnailForContextNode(
routing_id(), thumbnail, original_size));
}
-void ChromeRenderViewObserver::OnStartFrameSniffer(const string16& frame_name) {
- new FrameSniffer(render_view(), frame_name);
-}
-
void ChromeRenderViewObserver::OnGetFPS() {
float fps = (render_view()->GetFilteredTimePerFrame() > 0.0f)?
1.0f / render_view()->GetFilteredTimePerFrame() : 0.0f;
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
index b661eaa..fdb2350 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -139,7 +139,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
void OnSetVisuallyDeemphasized(bool deemphasized);
void OnRequestThumbnailForContextNode(int thumbnail_min_area_pixels,
gfx::Size thumbnail_max_size_pixels);
- void OnStartFrameSniffer(const string16& frame_name);
void OnGetFPS();
void OnAddStrictSecurityHost(const std::string& host);
void OnNPAPINotSupported();
diff --git a/chrome/renderer/frame_sniffer.cc b/chrome/renderer/frame_sniffer.cc
deleted file mode 100644
index 21dad2f..0000000
--- a/chrome/renderer/frame_sniffer.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/renderer/frame_sniffer.h"
-
-#include "base/logging.h"
-#include "chrome/common/render_messages.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
-
-FrameSniffer::FrameSniffer(content::RenderView* render_view,
- const string16 &unique_frame_name)
- : content::RenderViewObserver(render_view),
- unique_frame_name_(unique_frame_name) {
-}
-
-FrameSniffer::~FrameSniffer() {
-}
-
-void FrameSniffer::DidFailProvisionalLoad(WebKit::WebFrame* frame,
- const WebKit::WebURLError& error) {
- if (!ShouldSniffFrame(frame))
- return;
- Send(new ChromeViewHostMsg_FrameLoadingError(routing_id(), -error.reason));
-}
-
-void FrameSniffer::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
- bool is_new_navigation) {
- if (!ShouldSniffFrame(frame))
- return;
- Send(new ChromeViewHostMsg_FrameLoadingCompleted(routing_id()));
-}
-
-bool FrameSniffer::ShouldSniffFrame(WebKit::WebFrame* frame) {
- return frame->uniqueName() == unique_frame_name_;
-}
diff --git a/chrome/renderer/frame_sniffer.h b/chrome/renderer/frame_sniffer.h
deleted file mode 100644
index c5c2316..0000000
--- a/chrome/renderer/frame_sniffer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_RENDERER_FRAME_SNIFFER_H_
-#define CHROME_RENDERER_FRAME_SNIFFER_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "content/public/renderer/render_view_observer.h"
-
-// Class which observes events from the frame with specific name and sends IPC
-// messages to be handled by RenderViewHostObserver.
-class FrameSniffer : public content::RenderViewObserver {
- public:
- FrameSniffer(content::RenderView* render_view,
- const string16 &unique_frame_name);
- virtual ~FrameSniffer();
-
- // Implements RenderViewObserver.
- virtual void DidFailProvisionalLoad(
- WebKit::WebFrame* frame, const WebKit::WebURLError& error) OVERRIDE;
- virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
- bool is_new_navigation) OVERRIDE;
-
- private:
- bool ShouldSniffFrame(WebKit::WebFrame* frame);
-
- // Name of the frame to be monitored.
- string16 unique_frame_name_;
-
- DISALLOW_COPY_AND_ASSIGN(FrameSniffer);
-};
-
-#endif // CHROME_RENDERER_FRAME_SNIFFER_H_
generated by cgit v1.1 at 2025-02-11 13:51:02 +0000