diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 22:58:02 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 22:58:02 +0000 |
| commit | e12ff8d6b82d6720a98bda252f5d1db0b51f322b (patch) | |
| tree | 6845c8ba02827d756ca6c4c80baf94bfdb666270 | |
| parent | 7c91fd97de6635597cd572dc582c94f3c3284da5 (diff) | |
| download | chromium_src-e12ff8d6b82d6720a98bda252f5d1db0b51f322b.zip chromium_src-e12ff8d6b82d6720a98bda252f5d1db0b51f322b.tar.gz chromium_src-e12ff8d6b82d6720a98bda252f5d1db0b51f322b.tar.bz2 | |
Revert 69763 - Fix ChromeOS build.
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5999005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69764 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/gview_request_interceptor.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/plugin_selection_policy.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/plugin_selection_policy.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc index 59ded54..ea42d37 100644 --- a/chrome/browser/chromeos/gview_request_interceptor.cc +++ b/chrome/browser/chromeos/gview_request_interceptor.cc @@ -63,7 +63,7 @@ net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse( // redirect PDF files to Google Document Viewer. if (mime_type == kPdfMimeType) { FilePath pdf_path; - webkit::npapi::WebPluginInfo info; + WebPluginInfo info; PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path); if (NPAPI::PluginList::Singleton()->GetPluginInfoByPath(pdf_path, &info) && info.enabled) diff --git a/chrome/browser/chromeos/plugin_selection_policy.cc b/chrome/browser/chromeos/plugin_selection_policy.cc index dd261ea..477965a 100644 --- a/chrome/browser/chromeos/plugin_selection_policy.cc +++ b/chrome/browser/chromeos/plugin_selection_policy.cc @@ -120,9 +120,8 @@ bool PluginSelectionPolicy::InitFromFile(const FilePath& policy_file) { int PluginSelectionPolicy::FindFirstAllowed( const GURL& url, - const std::vector<webkit::npapi::WebPluginInfo>& info) { - for (std::vector<webkit::npapi::WebPluginInfo>::size_type i = 0; - i < info.size(); ++i) { + const std::vector<WebPluginInfo>& info) { + for (std::vector<WebPluginInfo>::size_type i = 0; i < info.size(); ++i) { if (IsAllowed(url, info[i].path)) return i; } diff --git a/chrome/browser/chromeos/plugin_selection_policy.h b/chrome/browser/chromeos/plugin_selection_policy.h index 08816bf..1bf60a0 100644 --- a/chrome/browser/chromeos/plugin_selection_policy.h +++ b/chrome/browser/chromeos/plugin_selection_policy.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/ref_counted.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/glue/plugins/webplugininfo.h" class GURL; class FilePath; @@ -45,8 +45,7 @@ class PluginSelectionPolicy // allowed (or if the info vector is empty). InitFromFile must // complete before any calls to FindFirstAllowed happen or it will // assert. - int FindFirstAllowed(const GURL& url, - const std::vector<webkit::npapi::WebPluginInfo>& info); + int FindFirstAllowed(const GURL& url, const std::vector<WebPluginInfo>& info); // Applies the current policy to the given path using the url to // look up what the policy for that domain is. Returns true if the |