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

Side by Side Diff: content/browser/plugin_service_impl.cc

Issue 11225045: Move a bunch of content\common code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 8 years, 2 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 "content/browser/plugin_service_impl.h" 5 #include "content/browser/plugin_service_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 27 matching lines...) Expand all
38 38
39 #if defined(OS_POSIX) 39 #if defined(OS_POSIX)
40 #include "content/browser/plugin_loader_posix.h" 40 #include "content/browser/plugin_loader_posix.h"
41 #endif 41 #endif
42 42
43 #if defined(OS_POSIX) && !defined(OS_OPENBSD) 43 #if defined(OS_POSIX) && !defined(OS_OPENBSD)
44 using ::base::files::FilePathWatcher; 44 using ::base::files::FilePathWatcher;
45 #endif 45 #endif
46 46
47 using content::BrowserThread; 47 using content::BrowserThread;
48 using content::PepperPluginRegistry;
48 using content::PluginService; 49 using content::PluginService;
49 using content::PluginServiceFilter; 50 using content::PluginServiceFilter;
50 51
51 namespace { 52 namespace {
52 53
53 // Callback set on the PluginList to assert that plugin loading happens on the 54 // Callback set on the PluginList to assert that plugin loading happens on the
54 // correct thread. 55 // correct thread.
55 #if defined(OS_WIN) 56 #if defined(OS_WIN)
56 void WillLoadPluginsCallbackWin( 57 void WillLoadPluginsCallbackWin(
57 base::SequencedWorkerPool::SequenceToken token) { 58 base::SequencedWorkerPool::SequenceToken token) {
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 } 708 }
708 709
709 void PluginServiceImpl::GetInternalPlugins( 710 void PluginServiceImpl::GetInternalPlugins(
710 std::vector<webkit::WebPluginInfo>* plugins) { 711 std::vector<webkit::WebPluginInfo>* plugins) {
711 plugin_list_->GetInternalPlugins(plugins); 712 plugin_list_->GetInternalPlugins(plugins);
712 } 713 }
713 714
714 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { 715 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
715 return plugin_list_; 716 return plugin_list_;
716 } 717 }
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_surface_tracker.cc ('k') | content/browser/renderer_host/image_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698