projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
safe_browsing
/
client_side_detection_host.h
diff --git
a/src/chrome/browser/safe_browsing/client_side_detection_host.h
b/src/chrome/browser/safe_browsing/client_side_detection_host.h
index
1492f13
..
24ca81c
100644
(file)
--- a/
src/chrome/browser/safe_browsing/client_side_detection_host.h
+++ b/
src/chrome/browser/safe_browsing/client_side_detection_host.h
@@
-67,7
+67,7
@@
class ClientSideDetectionHost : public content::WebContentsObserver,
explicit ClientSideDetectionHost(content::WebContents* tab);
// From content::WebContentsObserver.
explicit ClientSideDetectionHost(content::WebContents* tab);
// From content::WebContentsObserver.
- virtual void WebContentsDestroyed(
content::WebContents* tab
) OVERRIDE;
+ virtual void WebContentsDestroyed() OVERRIDE;
// Used for testing.
void set_safe_browsing_managers(
// Used for testing.
void set_safe_browsing_managers(
@@
-125,9
+125,9
@@
class ClientSideDetectionHost : public content::WebContentsObserver,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // Inherited from WebContentsObserver. This is called once the
onload handler
- //
is called
.
- virtual void D
ocumentOnLoadCompletedInMainFrame(int32 page_id
) OVERRIDE;
+ // Inherited from WebContentsObserver. This is called once the
page is
+ //
done loading
.
+ virtual void D
idStopLoading(content::RenderViewHost* rvh
) OVERRIDE;
// Returns true if the user has seen a regular SafeBrowsing
// interstitial for the current page. This is only true if the user has
// Returns true if the user has seen a regular SafeBrowsing
// interstitial for the current page. This is only true if the user has
@@
-169,7
+169,7
@@
class ClientSideDetectionHost : public content::WebContentsObserver,
bool should_extract_malware_features_;
bool should_classify_for_malware_;
bool should_extract_malware_features_;
bool should_classify_for_malware_;
- bool
on
load_complete_;
+ bool
page
load_complete_;
base::WeakPtrFactory<ClientSideDetectionHost> weak_factory_;
base::WeakPtrFactory<ClientSideDetectionHost> weak_factory_;