Index: components/html_viewer/html_frame.h |
diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h |
index fef256ab44ae835801a49a7b377a8c7420bd7ba0..274dc47ecc99f60bbfe232c2bb6bc8d80f9b3918 100644 |
--- a/components/html_viewer/html_frame.h |
+++ b/components/html_viewer/html_frame.h |
@@ -128,6 +128,7 @@ class HTMLFrame : public blink::WebFrameClient, |
// Returns the WebView for this frame, or null if there isn't one. The root |
// has a WebView, the children WebFrameWidgets. |
blink::WebView* web_view(); |
+ blink::WebView* web_view() const; |
sky
2015/10/02 16:03:40
Having a const function return a non-const is bad.
Elliot Glaysher
2015/10/02 21:42:33
Deleted this and made GetFocusedElement() non cons
|
blink::WebWidget* GetWebWidget(); |
// The mus::View this frame renders to. This is non-null for the local frame |
@@ -194,6 +195,12 @@ class HTMLFrame : public blink::WebFrameClient, |
virtual void didReceiveTitle(blink::WebLocalFrame* frame, |
const blink::WebString& title, |
blink::WebTextDirection direction); |
+ virtual void reportFindInFrameMatchCount(int identifier, |
+ int count, |
+ bool finalUpdate); |
+ virtual void reportFindInPageSelection(int identifier, |
+ int activeMatchOrdinal, |
+ const blink::WebRect& selection); |
private: |
friend class HTMLFrameTreeManager; |
@@ -244,6 +251,8 @@ class HTMLFrame : public blink::WebFrameClient, |
GlobalState* global_state() { return frame_tree_manager_->global_state(); } |
+ blink::WebElement GetFocusedElement() const; |
+ |
// Returns the Frame associated with the specified WebFrame. |
HTMLFrame* FindFrameWithWebFrame(blink::WebFrame* web_frame); |
@@ -280,6 +289,13 @@ class HTMLFrame : public blink::WebFrameClient, |
const OnWillNavigateCallback& callback) override; |
void OnFrameLoadingStateChanged(uint32_t frame_id, bool loading) override; |
void OnDispatchFrameLoadEvent(uint32_t frame_id) override; |
+ void Find(int32 request_id, const mojo::String& search_text, |
+ const FindCallback& callback) override; |
+ void StopFinding(bool clear_selection) override; |
+ void ScopeStringMatches(int32_t request_id, |
+ const mojo::String& search_test, |
+ bool reset) override; |
+ void CancelPendingScopingEffort() override; |
// blink::WebRemoteFrameClient: |
virtual void frameDetached(blink::WebRemoteFrameClient::DetachType type); |