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

Side by Side Diff: webkit/glue/plugins/plugin_list.cc

Issue 7995: Move Time, TimeDelta and TimeTicks into namespace base. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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) 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 <algorithm> 5 #include <algorithm>
6 #include <tchar.h> 6 #include <tchar.h>
7 7
8 #include "webkit/glue/plugins/plugin_list.h" 8 #include "webkit/glue/plugins/plugin_list.h"
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/registry.h" 14 #include "base/registry.h"
15 #include "base/scoped_ptr.h" 15 #include "base/scoped_ptr.h"
16 #include "base/string_piece.h" 16 #include "base/string_piece.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "base/sys_string_conversions.h" 18 #include "base/sys_string_conversions.h"
19 #include "base/time.h" 19 #include "base/time.h"
20 #include "webkit/activex_shim/activex_shared.h" 20 #include "webkit/activex_shim/activex_shared.h"
21 #include "webkit/glue/webkit_glue.h" 21 #include "webkit/glue/webkit_glue.h"
22 #include "webkit/glue/webplugin.h" 22 #include "webkit/glue/webplugin.h"
23 #include "webkit/glue/plugins/plugin_lib.h" 23 #include "webkit/glue/plugins/plugin_lib.h"
24 #include "googleurl/src/gurl.h" 24 #include "googleurl/src/gurl.h"
25 25
26 using base::TimeDelta;
27 using base::TimeTicks;
28
26 namespace NPAPI 29 namespace NPAPI
27 { 30 {
28 31
29 scoped_refptr<PluginList> PluginList::singleton_; 32 scoped_refptr<PluginList> PluginList::singleton_;
30 33
31 static const TCHAR kRegistryApps[] = 34 static const TCHAR kRegistryApps[] =
32 _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths"); 35 _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths");
33 static const TCHAR kRegistryFirefox[] = _T("firefox.exe"); 36 static const TCHAR kRegistryFirefox[] = _T("firefox.exe");
34 static const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe"); 37 static const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe");
35 static const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe"); 38 static const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe");
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 RegKey key(root_key, reg_path.c_str()); 481 RegKey key(root_key, reg_path.c_str());
479 482
480 std::wstring path; 483 std::wstring path;
481 if (key.ReadValue(kRegistryPath, &path)) 484 if (key.ReadValue(kRegistryPath, &path))
482 LoadPlugin(path); 485 LoadPlugin(path);
483 } 486 }
484 } 487 }
485 488
486 } // namespace NPAPI 489 } // namespace NPAPI
487 490
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698