summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pepper_flash_settings_manager.h
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 22:05:27 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 22:05:27 +0000
commit7c826913a4b98be007a322b37a744d5a90bdfd42 (patch)
tree8f39b639a9868baf7318bc4e5da910c3cbd5fefd /chrome/browser/pepper_flash_settings_manager.h
parente2baaa8f5f6527eefa2c44d14d98004a98eb61a2 (diff)
downloadchromium_src-7c826913a4b98be007a322b37a744d5a90bdfd42.zip
chromium_src-7c826913a4b98be007a322b37a744d5a90bdfd42.tar.gz
chromium_src-7c826913a4b98be007a322b37a744d5a90bdfd42.tar.bz2
Fail incoming requests in PepperFlashSettingsManager after an error.
This is the second of two CLs to address the issue mentioned below. It is in itself enough in itself to fix the issue, but given that the issue actually discovered two bugs, there is an other CL to fix the other bug too. See issue for details. BUG=144874 Review URL: https://chromiumcodereview.appspot.com/10986059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pepper_flash_settings_manager.h')
-rw-r--r--chrome/browser/pepper_flash_settings_manager.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/pepper_flash_settings_manager.h b/chrome/browser/pepper_flash_settings_manager.h
index 65bb055..3fd242b 100644
--- a/chrome/browser/pepper_flash_settings_manager.h
+++ b/chrome/browser/pepper_flash_settings_manager.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
#include "ppapi/c/private/ppp_flash_browser_operations.h"
#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
@@ -113,8 +114,10 @@ class PepperFlashSettingsManager {
void EnsureCoreExists();
- // Notified by |core_| when an error occurs.
- void OnError();
+ // Notifies us that an error occurred in |core|.
+ void OnError(Core* core);
+
+ base::WeakPtrFactory<PepperFlashSettingsManager> weak_ptr_factory_;
// |client_| is not owned by this object and must outlive it.
Client* client_;