Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 11348046: Add versioning to PluginFinder metadata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: divx Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) 858 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
859 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); 859 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
860 #endif 860 #endif
861 861
862 // Triggers initialization of the singleton instance on UI thread. 862 // Triggers initialization of the singleton instance on UI thread.
863 PluginFinder::GetInstance()->Init(); 863 PluginFinder::GetInstance()->Init();
864 864
865 #if defined(ENABLE_PLUGIN_INSTALLATION) 865 #if defined(ENABLE_PLUGIN_INSTALLATION)
866 DCHECK(!plugins_resource_service_.get()); 866 DCHECK(!plugins_resource_service_.get());
867 plugins_resource_service_ = new PluginsResourceService(local_state()); 867 plugins_resource_service_ = new PluginsResourceService(local_state());
868 plugins_resource_service_->StartAfterDelay(); 868 plugins_resource_service_->Init();
869 #endif 869 #endif
870 #endif // defined(ENABLE_PLUGINS) 870 #endif // defined(ENABLE_PLUGINS)
871 871
872 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 872 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
873 if (!command_line.HasSwitch(switches::kDisableWebResources)) { 873 if (!command_line.HasSwitch(switches::kDisableWebResources)) {
874 DCHECK(!promo_resource_service_.get()); 874 DCHECK(!promo_resource_service_.get());
875 promo_resource_service_ = new PromoResourceService; 875 promo_resource_service_ = new PromoResourceService;
876 promo_resource_service_->StartAfterDelay(); 876 promo_resource_service_->StartAfterDelay();
877 } 877 }
878 878
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 } 1031 }
1032 1032
1033 void BrowserProcessImpl::OnAutoupdateTimer() { 1033 void BrowserProcessImpl::OnAutoupdateTimer() {
1034 if (CanAutorestartForUpdate()) { 1034 if (CanAutorestartForUpdate()) {
1035 DLOG(WARNING) << "Detected update. Restarting browser."; 1035 DLOG(WARNING) << "Detected update. Restarting browser.";
1036 RestartBackgroundInstance(); 1036 RestartBackgroundInstance();
1037 } 1037 }
1038 } 1038 }
1039 1039
1040 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1040 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_finder.h » ('j') | chrome/browser/plugins/plugin_finder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698