Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / plugins / plugin_observer.h

diff --git a/src/chrome/browser/plugins/plugin_observer.h b/src/chrome/browser/plugins/plugin_observer.h
index 9e77213..a084bb1 100644 (file)
--- a/src/chrome/browser/plugins/plugin_observer.h
+++ b/src/chrome/browser/plugins/plugin_observer.h
@@ -15,7 +15,6 @@
 #endif
 
 class GURL;
-class InfoBarDelegate;
 class PluginFinder;
 class PluginMetadata;
 
@@ -28,17 +27,22 @@ namespace content {
 class WebContents;
 }
 
+namespace infobars {
+class InfoBarDelegate;
+}
+
 class PluginObserver : public content::WebContentsObserver,
                        public content::WebContentsUserData<PluginObserver> {
  public:
-  virtual ~PluginObserver();
+  ~PluginObserver() override;
 
   // content::WebContentsObserver implementation.
-  virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void PluginCrashed(const base::FilePath& plugin_path,
-                             base::ProcessId plugin_pid) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* render_frame_host) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   explicit PluginObserver(content::WebContents* web_contents);
@@ -52,7 +56,7 @@ class PluginObserver : public content::WebContentsObserver,
 #endif
 
   // Message handlers:
-  void OnBlockedUnauthorizedPlugin(const string16& name,
+  void OnBlockedUnauthorizedPlugin(const base::string16& name,
                                    const std::string& identifier);
   void OnBlockedOutdatedPlugin(int placeholder_id,
                                const std::string& identifier);
@@ -65,13 +69,13 @@ class PluginObserver : public content::WebContentsObserver,
   void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
   void OnNPAPINotSupported(const std::string& identifier);
 
-  base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
-
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   // Stores all PluginPlaceholderHosts, keyed by their routing ID.
   std::map<int, PluginPlaceholderHost*> plugin_placeholders_;
 #endif
 
+  base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginObserver);
 };