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

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

Issue 6538111: Move the rest of the core files in chrome\browser to content\browser.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
« no previous file with comments | « content/browser/plugin_service.h ('k') | content/browser/plugin_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugin_service.h" 5 #include "content/browser/plugin_service.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "base/synchronization/waitable_event.h" 15 #include "base/synchronization/waitable_event.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/browser_thread.h"
18 #include "chrome/browser/chrome_plugin_host.h" 17 #include "chrome/browser/chrome_plugin_host.h"
19 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/plugin_updater.h" 19 #include "chrome/browser/plugin_updater.h"
21 #include "chrome/browser/ppapi_plugin_process_host.h" 20 #include "chrome/browser/ppapi_plugin_process_host.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/renderer_host/render_process_host.h"
24 #include "chrome/browser/renderer_host/render_view_host.h"
25 #include "chrome/common/chrome_plugin_lib.h" 22 #include "chrome/common/chrome_plugin_lib.h"
26 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/default_plugin.h" 25 #include "chrome/common/default_plugin.h"
29 #include "chrome/common/extensions/extension.h" 26 #include "chrome/common/extensions/extension.h"
30 #include "chrome/common/gpu_plugin.h" 27 #include "chrome/common/gpu_plugin.h"
31 #include "chrome/common/logging_chrome.h" 28 #include "chrome/common/logging_chrome.h"
32 #include "chrome/common/notification_type.h" 29 #include "chrome/common/notification_type.h"
33 #include "chrome/common/notification_service.h" 30 #include "chrome/common/notification_service.h"
34 #include "chrome/common/pepper_plugin_registry.h" 31 #include "chrome/common/pepper_plugin_registry.h"
35 #include "chrome/common/plugin_messages.h" 32 #include "chrome/common/plugin_messages.h"
36 #include "chrome/common/render_messages.h" 33 #include "chrome/common/render_messages.h"
34 #include "content/browser/browser_thread.h"
35 #include "content/browser/renderer_host/render_process_host.h"
36 #include "content/browser/renderer_host/render_view_host.h"
37 #include "webkit/plugins/npapi/plugin_constants_win.h" 37 #include "webkit/plugins/npapi/plugin_constants_win.h"
38 #include "webkit/plugins/npapi/plugin_list.h" 38 #include "webkit/plugins/npapi/plugin_list.h"
39 #include "webkit/plugins/npapi/webplugininfo.h" 39 #include "webkit/plugins/npapi/webplugininfo.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "chrome/browser/chromeos/plugin_selection_policy.h" 42 #include "chrome/browser/chromeos/plugin_selection_policy.h"
43 #endif 43 #endif
44 44
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
46 static void NotifyPluginsOfActivation() { 46 static void NotifyPluginsOfActivation() {
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 #if defined(OS_LINUX) 575 #if defined(OS_LINUX)
576 // static 576 // static
577 void PluginService::RegisterFilePathWatcher( 577 void PluginService::RegisterFilePathWatcher(
578 FilePathWatcher *watcher, 578 FilePathWatcher *watcher,
579 const FilePath& path, 579 const FilePath& path,
580 FilePathWatcher::Delegate* delegate) { 580 FilePathWatcher::Delegate* delegate) {
581 bool result = watcher->Watch(path, delegate); 581 bool result = watcher->Watch(path, delegate);
582 DCHECK(result); 582 DCHECK(result);
583 } 583 }
584 #endif 584 #endif
OLDNEW
« no previous file with comments | « content/browser/plugin_service.h ('k') | content/browser/plugin_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698