diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 00:59:43 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 00:59:43 +0000 |
| commit | e02842f92566a95f1942b542af80c235ba369093 (patch) | |
| tree | 2ab7405bc1ccbd1cd2f1a8fe1690be59895fe395 /chrome/browser/plugin_service.cc | |
| parent | 552cd9e1eb12ad44e6a9240e10c6335a484997c5 (diff) | |
| download | chromium_src-e02842f92566a95f1942b542af80c235ba369093.zip chromium_src-e02842f92566a95f1942b542af80c235ba369093.tar.gz chromium_src-e02842f92566a95f1942b542af80c235ba369093.tar.bz2 | |
Fix the internal plugin getting disabled after an update.
Review URL: http://codereview.chromium.org/2869003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 165ca52..14f03fc 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -103,14 +103,6 @@ void PluginService::InitGlobalInstance(Profile* profile) { bool enabled = true; plugin->GetBoolean(L"enabled", &enabled); - if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) { - found_internal_pdf = true; - if (!enabled && force_enable_internal_pdf) { - enabled = true; - plugin->SetBoolean(L"enabled", true); - } - } - FilePath plugin_path(path); if (update_internal_dir && FilePath::CompareIgnoreCase(plugin_path.DirName().value(), @@ -118,7 +110,16 @@ void PluginService::InitGlobalInstance(Profile* profile) { // If the internal plugin directory has changed and if the plugin looks // internal, update its path in the prefs. plugin_path = cur_internal_dir.Append(plugin_path.BaseName()); - plugin->SetString(L"path", plugin_path.value()); + path = plugin_path.value(); + plugin->SetString(L"path", path); + } + + if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) { + found_internal_pdf = true; + if (!enabled && force_enable_internal_pdf) { + enabled = true; + plugin->SetBoolean(L"enabled", true); + } } if (!enabled) |