content/browser/plugin_service.h - Issue 7006006: Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or

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

Unified Diff: content/browser/plugin_service.h

Issue 7006006: Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: content/browser/plugin_service.h

diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h

index cc039d63ff15ac3289442d9ae50434abffd18f13..399055e444dfe0684c66809870ec52067995f7e3 100644

--- a/content/browser/plugin_service.h

+++ b/content/browser/plugin_service.h

@@ -33,7 +33,7 @@

#include "base/win/registry.h"

#endif

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

#include "base/files/file_path_watcher.h"

#endif

@@ -151,7 +151,7 @@ class PluginService

const FilePath& plugin_path,

PluginProcessHost::Client* client);

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

// Registers a new FilePathWatcher for a given path.

static void RegisterFilePathWatcher(

base::files::FilePathWatcher* watcher,

@@ -179,7 +179,7 @@ class PluginService

base::WaitableEventWatcher hklm_watcher_;

#endif

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX)

ScopedVector<base::files::FilePathWatcher> file_watchers_;

scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_;

#endif

« no previous file with comments | « content/browser/gpu/gpu_process_host_ui_shim.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »