diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 00:18:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 00:18:47 +0000 |
| commit | 5c19e8b6924c4caff5d136653ced6c9fc76391e0 (patch) | |
| tree | d33e0d4e2f294eae892b61c5c053c76b9b600627 | |
| parent | c8f73aba9f1fd8b2e0a34fcca08a1e968ddd8244 (diff) | |
| download | chromium_src-5c19e8b6924c4caff5d136653ced6c9fc76391e0.zip chromium_src-5c19e8b6924c4caff5d136653ced6c9fc76391e0.tar.gz chromium_src-5c19e8b6924c4caff5d136653ced6c9fc76391e0.tar.bz2 | |
Fix build break from previous change (files moved in between try bot run and commit).
Review URL: http://codereview.chromium.org/6379003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72241 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/pdf_unsupported_feature.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/plugin_service.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/pdf_unsupported_feature.cc b/chrome/browser/pdf_unsupported_feature.cc index 2e89da2..6c8f217 100644 --- a/chrome/browser/pdf_unsupported_feature.cc +++ b/chrome/browser/pdf_unsupported_feature.cc @@ -4,8 +4,6 @@ #include "chrome/browser/pdf_unsupported_feature.h" -#include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" @@ -18,6 +16,8 @@ #include "chrome/common/jstemplate_builder.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugininfo.h" diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 4cf18ec..82fa237 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -366,7 +366,7 @@ bool PluginService::GetFirstAllowedPluginInfo( return false; #else { - AutoLock auto_lock(overridden_plugins_lock_); + base::AutoLock auto_lock(overridden_plugins_lock_); for (size_t i = 0; i < overridden_plugins_.size(); ++i) { if (overridden_plugins_[i].render_process_id == render_process_id && overridden_plugins_[i].render_view_id == render_view_id && @@ -462,7 +462,7 @@ void PluginService::Observe(NotificationType type, case NotificationType::RENDERER_PROCESS_CLOSED: { int render_process_id = Source<RenderProcessHost>(source).ptr()->id(); - AutoLock auto_lock(overridden_plugins_lock_); + base::AutoLock auto_lock(overridden_plugins_lock_); for (size_t i = 0; i < overridden_plugins_.size(); ++i) { if (overridden_plugins_[i].render_process_id == render_process_id) { overridden_plugins_.erase(overridden_plugins_.begin() + i); @@ -493,7 +493,7 @@ bool PluginService::PrivatePluginAllowedForURL(const FilePath& plugin_path, } void PluginService::OverridePluginForTab(OverriddenPlugin plugin) { - AutoLock auto_lock(overridden_plugins_lock_); + base::AutoLock auto_lock(overridden_plugins_lock_); overridden_plugins_.push_back(plugin); } |