| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 | 759 |
| 760 void BrowserProcessImpl::PreMainMessageLoopRun() { | 760 void BrowserProcessImpl::PreMainMessageLoopRun() { |
| 761 PluginService* plugin_service = PluginService::GetInstance(); | 761 PluginService* plugin_service = PluginService::GetInstance(); |
| 762 plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); | 762 plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); |
| 763 plugin_service->StartWatchingPlugins(); | 763 plugin_service->StartWatchingPlugins(); |
| 764 | 764 |
| 765 // Register the internal Flash if available. | 765 // Register the internal Flash if available. |
| 766 FilePath path; | 766 FilePath path; |
| 767 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 767 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 768 switches::kDisableInternalFlash) && | 768 switches::kDisableInternalFlash) && |
| 769 PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) { | 769 PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &path)) { |
| 770 plugin_service->AddExtraPluginPath(path); | 770 plugin_service->AddExtraPluginPath(path); |
| 771 } | 771 } |
| 772 | 772 |
| 773 // Register bundled Pepper Flash if available. | 773 // Register bundled Pepper Flash if available. |
| 774 content::PepperPluginInfo plugin; | 774 content::PepperPluginInfo plugin; |
| 775 bool add_at_beginning = false; | 775 bool add_at_beginning = false; |
| 776 chrome::ChromeContentClient* content_client = | 776 chrome::ChromeContentClient* content_client = |
| 777 static_cast<chrome::ChromeContentClient*>(content::GetContentClient()); | 777 static_cast<chrome::ChromeContentClient*>(content::GetContentClient()); |
| 778 if (content_client->GetBundledFieldTrialPepperFlash(&plugin, | 778 if (content_client->GetBundledFieldTrialPepperFlash(&plugin, |
| 779 &add_at_beginning)) { | 779 &add_at_beginning)) { |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 } | 931 } |
| 932 | 932 |
| 933 void BrowserProcessImpl::OnAutoupdateTimer() { | 933 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 934 if (CanAutorestartForUpdate()) { | 934 if (CanAutorestartForUpdate()) { |
| 935 DLOG(WARNING) << "Detected update. Restarting browser."; | 935 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 936 RestartBackgroundInstance(); | 936 RestartBackgroundInstance(); |
| 937 } | 937 } |
| 938 } | 938 } |
| 939 | 939 |
| 940 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 940 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |