Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Side by Side Diff: trunk/src/chrome/browser/plugins/plugin_observer.h

Issue 271863005: Revert 268939 "Pass RenderFrameHost to WebContentObservers' mess..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
34 class PluginObserver : public content::WebContentsObserver, 34 class PluginObserver : public content::WebContentsObserver,
35 public content::WebContentsUserData<PluginObserver> { 35 public content::WebContentsUserData<PluginObserver> {
36 public: 36 public:
37 virtual ~PluginObserver(); 37 virtual ~PluginObserver();
38 38
39 // content::WebContentsObserver implementation. 39 // content::WebContentsObserver implementation.
40 virtual void RenderFrameCreated( 40 virtual void RenderFrameCreated(
41 content::RenderFrameHost* render_frame_host) OVERRIDE; 41 content::RenderFrameHost* render_frame_host) OVERRIDE;
42 virtual void PluginCrashed(const base::FilePath& plugin_path, 42 virtual void PluginCrashed(const base::FilePath& plugin_path,
43 base::ProcessId plugin_pid) OVERRIDE; 43 base::ProcessId plugin_pid) OVERRIDE;
44 virtual bool OnMessageReceived(
45 const IPC::Message& message,
46 content::RenderFrameHost* render_frame_host) OVERRIDE;
47 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 44 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
48 45
49 private: 46 private:
50 explicit PluginObserver(content::WebContents* web_contents); 47 explicit PluginObserver(content::WebContents* web_contents);
51 friend class content::WebContentsUserData<PluginObserver>; 48 friend class content::WebContentsUserData<PluginObserver>;
52 49
53 class PluginPlaceholderHost; 50 class PluginPlaceholderHost;
54 51
55 #if defined(ENABLE_PLUGIN_INSTALLATION) 52 #if defined(ENABLE_PLUGIN_INSTALLATION)
56 void InstallMissingPlugin(PluginInstaller* installer, 53 void InstallMissingPlugin(PluginInstaller* installer,
(...skipping 18 matching lines...) Expand all
75 // Stores all PluginPlaceholderHosts, keyed by their routing ID. 72 // Stores all PluginPlaceholderHosts, keyed by their routing ID.
76 std::map<int, PluginPlaceholderHost*> plugin_placeholders_; 73 std::map<int, PluginPlaceholderHost*> plugin_placeholders_;
77 #endif 74 #endif
78 75
79 base::WeakPtrFactory<PluginObserver> weak_ptr_factory_; 76 base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
80 77
81 DISALLOW_COPY_AND_ASSIGN(PluginObserver); 78 DISALLOW_COPY_AND_ASSIGN(PluginObserver);
82 }; 79 };
83 80
84 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ 81 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698