summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 23:53:17 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 23:53:17 +0000
commit7cc4ad1d9f0cdae224af53eb29272d1bfca64df3 (patch)
tree5a6e22f97b98d596a8808e673ee584947c6d8eb3 /chrome
parent2001fe88673d7b232014bf801b17ee9f4dff52ed (diff)
downloadchromium_src-7cc4ad1d9f0cdae224af53eb29272d1bfca64df3.zip
chromium_src-7cc4ad1d9f0cdae224af53eb29272d1bfca64df3.tar.gz
chromium_src-7cc4ad1d9f0cdae224af53eb29272d1bfca64df3.tar.bz2
Make plugin_installer.cc compile on Posix.
Review URL: http://codereview.chromium.org/31001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser.scons1
-rw-r--r--chrome/browser/tab_contents/web_contents.cc2
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj2
-rw-r--r--chrome/common/temp_scaffolding_stubs.h7
4 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 44bab2c..f701eaa 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -712,7 +712,6 @@ if not env.Bit('windows'):
'modal_html_dialog_delegate.cc',
'google_update.cc',
'password_manager/encryptor.cc',
- 'plugin_installer.cc',
'printing/page_overlays.cc',
'printing/print_job.cc',
'printing/print_job_manager.cc',
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index b360d6f..54b8d6e 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/load_from_memory_cache_details.h"
#include "chrome/browser/load_notification_details.h"
#include "chrome/browser/password_manager/password_manager.h"
+#include "chrome/browser/plugin_installer.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -47,7 +48,6 @@
#include "chrome/browser/character_encoding.h"
#include "chrome/browser/download/download_request_manager.h"
#include "chrome/browser/modal_html_dialog_delegate.h"
-#include "chrome/browser/plugin_installer.h"
#include "chrome/browser/plugin_service.h"
#include "chrome/browser/printing/print_job.h"
#include "chrome/browser/search_engines/template_url_fetcher.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 5ee9e12..e52ae08b 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -603,6 +603,7 @@
E765478D55A73228BAD044E3 /* cert_store.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8570E9D4839009A6919 /* cert_store.cc */; };
E9104FE91402AE1783A22D93 /* alternate_nav_url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8240E9D4839009A6919 /* alternate_nav_url_fetcher.cc */; };
EA8058FD371756B46906B157 /* password_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16EB40F21445600861FAC /* password_manager.cc */; };
+ EAB0A6CABCE0435985DA8A70 /* plugin_installer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8DB0E9D4839009A6919 /* plugin_installer.cc */; };
EEA5B4CB2EB282403BDE41D7 /* tab_contents.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9E40F1EC32700106F0D /* tab_contents.cc */; };
F081CEE97F8C75FEAF3D0FD2 /* jstemplate_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC70E9D4C9F009A6919 /* jstemplate_builder.cc */; };
F4143C8C0F4B1D43008C8F73 /* renderer.sb in Resources */ = {isa = PBXBuildFile; fileRef = F4143C8B0F4B1D07008C8F73 /* renderer.sb */; };
@@ -5503,6 +5504,7 @@
4D7BFA280E9D490C009A6919 /* page_usage_data.cc in Sources */,
E48B6C2C0F27840B002E47EC /* password_form_manager.cc in Sources */,
EA8058FD371756B46906B157 /* password_manager.cc in Sources */,
+ EAB0A6CABCE0435985DA8A70 /* plugin_installer.cc in Sources */,
1FFE452BCABBD0158B029D4D /* plugin_process_host.cc in Sources */,
0A124E6F8B659427ABF96220 /* plugin_service.cc in Sources */,
826847800F2F69D1009F6555 /* profile.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 8f8ec0e..dd7bb5b 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -79,7 +79,6 @@ class SessionCommand;
class SessionID;
class SiteInstance;
class SpellChecker;
-class TabContents;
class TabContentsDelegate;
class TabContentsFactory;
class TabNavigation;
@@ -422,6 +421,7 @@ class TabContents : public PageNavigator, public NotificationObserver {
static TabContentsFactory* RegisterFactory(TabContentsType type,
TabContentsFactory* factory);
void OnStartDownload(DownloadItem* download) { NOTIMPLEMENTED(); }
+ void RemoveInfoBar(InfoBarDelegate* delegate) { NOTIMPLEMENTED(); }
protected:
typedef std::vector<ConstrainedWindow*> ConstrainedWindowList;
ConstrainedWindowList child_windows_;
@@ -578,11 +578,6 @@ class PrintViewManager {
};
}
-class PluginInstaller {
- public:
- PluginInstaller(WebContents*) { }
-};
-
class HungRendererWarning {
public:
static void HideForWebContents(WebContents*) { NOTIMPLEMENTED(); }