summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_observer.h
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 17:27:28 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 17:27:28 +0000
commit43b7eaca6e8b1c46fc0f9d29be7c38014874defc (patch)
treed532110d25e970e067ecb66d2f33d195f45eaf16 /chrome/browser/plugin_observer.h
parent4f4b2ac3eee9515b079b524606de07bd04a346c7 (diff)
downloadchromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.zip
chromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.tar.gz
chromium_src-43b7eaca6e8b1c46fc0f9d29be7c38014874defc.tar.bz2
Remove plugin installation code on ChromeOS and Aura.
BUG=62079 TEST=compiles Review URL: http://codereview.chromium.org/9113011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_observer.h')
-rw-r--r--chrome/browser/plugin_observer.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/chrome/browser/plugin_observer.h b/chrome/browser/plugin_observer.h
index 76399e2..9deaedd 100644
--- a/chrome/browser/plugin_observer.h
+++ b/chrome/browser/plugin_observer.h
@@ -6,15 +6,22 @@
#define CHROME_BROWSER_PLUGIN_OBSERVER_H_
#pragma once
-#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/web_contents_observer.h"
+#if defined(ENABLE_PLUGIN_INSTALLATION)
+#include "base/memory/scoped_vector.h"
+#endif
+
class GURL;
class InfoBarDelegate;
class PluginInstaller;
class TabContentsWrapper;
+#if defined(ENABLE_PLUGIN_INSTALLATION)
+class PluginInstaller;
+#endif
+
class PluginObserver : public content::WebContentsObserver {
public:
explicit PluginObserver(TabContentsWrapper* tab_contents);
@@ -24,23 +31,28 @@ class PluginObserver : public content::WebContentsObserver {
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private:
+#if defined(ENABLE_PLUGIN_INSTALLATION)
class MissingPluginHost;
+#endif
void OnBlockedOutdatedPlugin(const string16& name, const GURL& update_url);
+#if defined(ENABLE_PLUGIN_INSTALLATION)
void OnFindMissingPlugin(int placeholder_id, const std::string& mime_type);
void FoundMissingPlugin(int placeholder_id,
const std::string& mime_type,
PluginInstaller* installer);
- void DidNotFindMissingPlugin(int placeholder_id,
- const std::string& mime_type);
+ void DidNotFindMissingPlugin(int placeholder_id);
void InstallMissingPlugin(PluginInstaller* installer);
+#endif
base::WeakPtrFactory<PluginObserver> weak_ptr_factory_;
TabContentsWrapper* tab_contents_;
+#if defined(ENABLE_PLUGIN_INSTALLATION)
ScopedVector<MissingPluginHost> missing_plugins_;
+#endif
DISALLOW_COPY_AND_ASSIGN(PluginObserver);
};