OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ | 5 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ |
6 #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ | 6 #define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "content/public/browser/web_contents_observer.h" | 10 #include "content/public/browser/web_contents_observer.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 namespace content { | 27 namespace content { |
28 class WebContents; | 28 class WebContents; |
29 } | 29 } |
30 | 30 |
31 class PluginObserver : public content::WebContentsObserver, | 31 class PluginObserver : public content::WebContentsObserver, |
32 public content::WebContentsUserData<PluginObserver> { | 32 public content::WebContentsUserData<PluginObserver> { |
33 public: | 33 public: |
34 virtual ~PluginObserver(); | 34 virtual ~PluginObserver(); |
35 | 35 |
36 // content::WebContentsObserver implementation. | 36 // content::WebContentsObserver implementation. |
37 virtual void PluginCrashed(const FilePath& plugin_path) OVERRIDE; | 37 virtual void PluginCrashed(const FilePath& plugin_path, |
| 38 base::ProcessId plugin_pid) OVERRIDE; |
38 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 39 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
39 | 40 |
40 private: | 41 private: |
41 explicit PluginObserver(content::WebContents* web_contents); | 42 explicit PluginObserver(content::WebContents* web_contents); |
42 friend class content::WebContentsUserData<PluginObserver>; | 43 friend class content::WebContentsUserData<PluginObserver>; |
43 | 44 |
44 class PluginPlaceholderHost; | 45 class PluginPlaceholderHost; |
45 | 46 |
46 #if defined(ENABLE_PLUGIN_INSTALLATION) | 47 #if defined(ENABLE_PLUGIN_INSTALLATION) |
47 void InstallMissingPlugin(PluginInstaller* installer, | 48 void InstallMissingPlugin(PluginInstaller* installer, |
(...skipping 18 matching lines...) Expand all Loading... |
66 | 67 |
67 #if defined(ENABLE_PLUGIN_INSTALLATION) | 68 #if defined(ENABLE_PLUGIN_INSTALLATION) |
68 // Stores all PluginPlaceholderHosts, keyed by their routing ID. | 69 // Stores all PluginPlaceholderHosts, keyed by their routing ID. |
69 std::map<int, PluginPlaceholderHost*> plugin_placeholders_; | 70 std::map<int, PluginPlaceholderHost*> plugin_placeholders_; |
70 #endif | 71 #endif |
71 | 72 |
72 DISALLOW_COPY_AND_ASSIGN(PluginObserver); | 73 DISALLOW_COPY_AND_ASSIGN(PluginObserver); |
73 }; | 74 }; |
74 | 75 |
75 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ | 76 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ |
OLD | NEW |