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

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: sync 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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) 830 if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
831 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins")); 831 plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
832 #endif 832 #endif
833 833
834 // Triggers initialization of the singleton instance on UI thread. 834 // Triggers initialization of the singleton instance on UI thread.
835 PluginFinder::GetInstance()->Init(); 835 PluginFinder::GetInstance()->Init();
836 836
837 #if defined(ENABLE_PLUGIN_INSTALLATION) 837 #if defined(ENABLE_PLUGIN_INSTALLATION)
838 DCHECK(!plugins_resource_service_.get()); 838 DCHECK(!plugins_resource_service_.get());
839 plugins_resource_service_ = new PluginsResourceService(local_state()); 839 plugins_resource_service_ = new PluginsResourceService(local_state());
840 plugins_resource_service_->StartAfterDelay(); 840 plugins_resource_service_->Init();
841 #endif 841 #endif
842 #endif // defined(ENABLE_PLUGINS) 842 #endif // defined(ENABLE_PLUGINS)
843 843
844 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 844 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
845 if (!command_line.HasSwitch(switches::kDisableWebResources)) { 845 if (!command_line.HasSwitch(switches::kDisableWebResources)) {
846 DCHECK(!promo_resource_service_.get()); 846 DCHECK(!promo_resource_service_.get());
847 promo_resource_service_ = new PromoResourceService; 847 promo_resource_service_ = new PromoResourceService;
848 promo_resource_service_->StartAfterDelay(); 848 promo_resource_service_->StartAfterDelay();
849 } 849 }
850 850
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 } 1003 }
1004 1004
1005 void BrowserProcessImpl::OnAutoupdateTimer() { 1005 void BrowserProcessImpl::OnAutoupdateTimer() {
1006 if (CanAutorestartForUpdate()) { 1006 if (CanAutorestartForUpdate()) {
1007 DLOG(WARNING) << "Detected update. Restarting browser."; 1007 DLOG(WARNING) << "Detected update. Restarting browser.";
1008 RestartBackgroundInstance(); 1008 RestartBackgroundInstance();
1009 } 1009 }
1010 } 1010 }
1011 1011
1012 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1012 #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