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

Side by Side Diff: chrome/common/chrome_plugin_lib.cc

Issue 3007037: Cleanup our Registry API. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: fix nit Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/common/chrome_plugin_lib.h" 5 #include "chrome/common/chrome_plugin_lib.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/hash_tables.h" 8 #include "base/hash_tables.h"
9 #include "base/histogram.h" 9 #include "base/histogram.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/perftimer.h" 12 #include "base/perftimer.h"
13 #include "base/thread.h" 13 #include "base/thread.h"
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 #include "base/registry.h" 15 #include "base/registry.h"
16 #endif 16 #endif
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "chrome/common/chrome_counters.h" 18 #include "chrome/common/chrome_counters.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/notification_service.h" 20 #include "chrome/common/notification_service.h"
21 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
22 #include "webkit/glue/plugins/plugin_list.h" 22 #include "webkit/glue/plugins/plugin_list.h"
23 23
24 using base::TimeDelta; 24 using base::TimeDelta;
25 25
26 // TODO(port): revisit when plugins happier 26 // TODO(port): revisit when plugins happier
27 #if defined(OS_WIN) 27 #if defined(OS_WIN)
28 const TCHAR ChromePluginLib::kRegistryChromePlugins[] = 28 const wchar_t ChromePluginLib::kRegistryChromePlugins[] =
29 _T("Software\\Google\\Chrome\\Plugins"); 29 L"Software\\Google\\Chrome\\Plugins";
30 static const TCHAR kRegistryLoadOnStartup[] = _T("LoadOnStartup"); 30 static const wchar_t kRegistryLoadOnStartup[] = L"LoadOnStartup";
31 static const TCHAR kRegistryPath[] = _T("Path"); 31 static const wchar_t kRegistryPath[] = L"Path";
32 #endif 32 #endif
33 33
34 typedef base::hash_map<FilePath, scoped_refptr<ChromePluginLib> > 34 typedef base::hash_map<FilePath, scoped_refptr<ChromePluginLib> >
35 PluginMap; 35 PluginMap;
36 36
37 // A map of all the instantiated plugins. 37 // A map of all the instantiated plugins.
38 static PluginMap* g_loaded_libs; 38 static PluginMap* g_loaded_libs;
39 39
40 // The thread plugins are loaded and used in, lazily initialized upon 40 // The thread plugins are loaded and used in, lazily initialized upon
41 // the first creation call. 41 // the first creation call.
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 if (initialized_) 281 if (initialized_)
282 CP_Shutdown(); 282 CP_Shutdown();
283 283
284 #if defined(OS_WIN) 284 #if defined(OS_WIN)
285 if (module_) { 285 if (module_) {
286 FreeLibrary(module_); 286 FreeLibrary(module_);
287 module_ = 0; 287 module_ = 0;
288 } 288 }
289 #endif 289 #endif
290 } 290 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/firefox_importer_utils_win.cc ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698