Update To 11.40.268.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 632bfdd..2384e35 100644 (file)
--- a/src/chrome/browser/safe_browsing/client_side_detection_host.h
+++ b/src/chrome/browser/safe_browsing/client_side_detection_host.h
@@ -35,27 +35,27 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
   // The caller keeps ownership of the tab object and is responsible for
   // ensuring that it stays valid until WebContentsDestroyed is called.
   static ClientSideDetectionHost* Create(content::WebContents* tab);
-  virtual ~ClientSideDetectionHost();
+  ~ClientSideDetectionHost() override;
 
   // From content::WebContentsObserver.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // From content::WebContentsObserver.  If we navigate away we cancel all
   // pending callbacks that could show an interstitial, and check to see whether
   // we should classify the new URL.
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
 
   // Called when the SafeBrowsingService found a hit with one of the
   // SafeBrowsing lists.  This method is called on the UI thread.
-  virtual void OnSafeBrowsingHit(
-      const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
+  void OnSafeBrowsingHit(
+      const SafeBrowsingUIManager::UnsafeResource& resource) override;
 
   // Called when the SafeBrowsingService finds a match on the SB lists.
   // Called on the UI thread. Called even if the resource is whitelisted.
-  virtual void OnSafeBrowsingMatch(
-      const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
+  void OnSafeBrowsingMatch(
+      const SafeBrowsingUIManager::UnsafeResource& resource) override;
 
   virtual scoped_refptr<SafeBrowsingDatabaseManager> database_manager();
 
@@ -67,7 +67,7 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
   explicit ClientSideDetectionHost(content::WebContents* tab);
 
   // From content::WebContentsObserver.
-  virtual void WebContentsDestroyed() OVERRIDE;
+  void WebContentsDestroyed() override;
 
   // Used for testing.
   void set_safe_browsing_managers(
@@ -122,13 +122,13 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
 
   // From NotificationObserver.  Called when a notification comes in.  This
   // method is called in the UI thread.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // Inherited from WebContentsObserver.  This is called once the page is
   // done loading.
-  virtual void DidStopLoading(content::RenderViewHost* rvh) OVERRIDE;
+  void DidStopLoading(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