OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 switches::kDisableInternalFlash) && | 759 switches::kDisableInternalFlash) && |
760 PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) { | 760 PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) { |
761 plugin_service->AddExtraPluginPath(path); | 761 plugin_service->AddExtraPluginPath(path); |
762 } | 762 } |
763 | 763 |
764 // Register bundled Pepper Flash if available. | 764 // Register bundled Pepper Flash if available. |
765 content::PepperPluginInfo plugin; | 765 content::PepperPluginInfo plugin; |
766 bool add_at_beginning = false; | 766 bool add_at_beginning = false; |
767 chrome::ChromeContentClient* content_client = | 767 chrome::ChromeContentClient* content_client = |
768 static_cast<chrome::ChromeContentClient*>(content::GetContentClient()); | 768 static_cast<chrome::ChromeContentClient*>(content::GetContentClient()); |
769 if (content_client->GetBundledPepperFlash(&plugin, &add_at_beginning)) { | 769 if (content_client->GetBundledFieldTrialPepperFlash(&plugin, |
| 770 &add_at_beginning)) { |
770 plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(), | 771 plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(), |
771 add_at_beginning); | 772 add_at_beginning); |
772 } | 773 } |
773 | 774 |
774 #if defined(OS_POSIX) | 775 #if defined(OS_POSIX) |
775 // Also find plugins in a user-specific plugins dir, | 776 // Also find plugins in a user-specific plugins dir, |
776 // e.g. ~/.config/chromium/Plugins. | 777 // e.g. ~/.config/chromium/Plugins. |
777 FilePath user_data_dir; | 778 FilePath user_data_dir; |
778 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { | 779 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { |
779 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); | 780 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 } | 928 } |
928 | 929 |
929 void BrowserProcessImpl::OnAutoupdateTimer() { | 930 void BrowserProcessImpl::OnAutoupdateTimer() { |
930 if (CanAutorestartForUpdate()) { | 931 if (CanAutorestartForUpdate()) { |
931 DLOG(WARNING) << "Detected update. Restarting browser."; | 932 DLOG(WARNING) << "Detected update. Restarting browser."; |
932 RestartBackgroundInstance(); | 933 RestartBackgroundInstance(); |
933 } | 934 } |
934 } | 935 } |
935 | 936 |
936 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 937 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |