content/browser/plugin_service.cc - Issue 6693054: Get rid of extensions dependency from content\browser.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6693054: Get rid of extensions dependency from content\browser. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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/in_process_webkit/webkit_context_unittest.cc ('k') | content/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

OLD	NEW
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 "content/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/compiler_specific.h"	10 #include "base/compiler_specific.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

13 #include "base/synchronization/waitable_event.h"	13 #include "base/synchronization/waitable_event.h"

14 #include "base/threading/thread.h"	14 #include "base/threading/thread.h"

15 #include "base/utf_string_conversions.h"	15 #include "base/utf_string_conversions.h"

16 #include "base/values.h"	16 #include "base/values.h"

17 #include "chrome/browser/browser_process.h"	17 #include "chrome/browser/browser_process.h"

18 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/plugin_updater.h"	18 #include "chrome/browser/plugin_updater.h"

20 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/common/chrome_paths.h"	20 #include "chrome/common/chrome_paths.h"

22 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

23 #include "chrome/common/default_plugin.h"	22 #include "chrome/common/default_plugin.h"

24 #include "chrome/common/extensions/extension.h"	23 #include "chrome/common/extensions/extension.h"

25 #include "chrome/common/logging_chrome.h"	24 #include "chrome/common/logging_chrome.h"

26 #include "chrome/common/pepper_plugin_registry.h"	25 #include "chrome/common/pepper_plugin_registry.h"

27 #include "chrome/common/render_messages.h"	26 #include "chrome/common/render_messages.h"

28 #include "content/browser/browser_thread.h"	27 #include "content/browser/browser_thread.h"

(...skipping 518 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
547 #if defined(OS_LINUX)	546 #if defined(OS_LINUX)

548 // static	547 // static

549 void PluginService::RegisterFilePathWatcher(	548 void PluginService::RegisterFilePathWatcher(

550 FilePathWatcher *watcher,	549 FilePathWatcher *watcher,

551 const FilePath& path,	550 const FilePath& path,

552 FilePathWatcher::Delegate* delegate) {	551 FilePathWatcher::Delegate* delegate) {

553 bool result = watcher->Watch(path, delegate);	552 bool result = watcher->Watch(path, delegate);

554 DCHECK(result);	553 DCHECK(result);

555 }	554 }

556 #endif	555 #endif

OLD	NEW