| Index: content/renderer/android/content_detector.h
|
| diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h
|
| index d17a5855b2375946be40bbb37d8f0c000a45c27a..85ee6688d6ff77cea306a592fc127cc38e1f6c45 100644
|
| --- a/content/renderer/android/content_detector.h
|
| +++ b/content/renderer/android/content_detector.h
|
| @@ -8,7 +8,7 @@
|
| #include "third_party/WebKit/public/web/WebRange.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebHitTestResult;
|
| }
|
|
|
| @@ -20,13 +20,13 @@ class ContentDetector {
|
| // Holds the content detection results.
|
| struct Result {
|
| Result();
|
| - Result(const WebKit::WebRange& content_boundaries,
|
| + Result(const blink::WebRange& content_boundaries,
|
| const std::string& text,
|
| const GURL& intent_url);
|
| ~Result();
|
|
|
| bool valid;
|
| - WebKit::WebRange content_boundaries;
|
| + blink::WebRange content_boundaries;
|
| std::string text; // Processed text of the content.
|
| GURL intent_url; // URL of the intent that should process this content.
|
| };
|
| @@ -35,7 +35,7 @@ class ContentDetector {
|
|
|
| // Returns a WebKit range delimiting the contents found around the tapped
|
| // position. If no content is found a null range will be returned.
|
| - Result FindTappedContent(const WebKit::WebHitTestResult& hit_test);
|
| + Result FindTappedContent(const blink::WebHitTestResult& hit_test);
|
|
|
| protected:
|
| ContentDetector() {}
|
| @@ -57,7 +57,7 @@ class ContentDetector {
|
| // position in order to search for content.
|
| virtual size_t GetMaximumContentLength() = 0;
|
|
|
| - WebKit::WebRange FindContentRange(const WebKit::WebHitTestResult& hit_test,
|
| + blink::WebRange FindContentRange(const blink::WebHitTestResult& hit_test,
|
| std::string* content_text);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContentDetector);
|
|
|