content/browser/plugin_service.cc - Issue 6657003: Update a bunch of files to the new location of notification files.

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.cc

Issue 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 9 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.cc

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

index 4e68f2342fe11c3fb6bfbe0641e65805a91d3e9b..1b6544c487725906d4d7c213ea42f86d384b9594 100644

--- a/content/browser/plugin_service.cc

+++ b/content/browser/plugin_service.cc

@@ -9,23 +9,21 @@

#include "base/command_line.h"

#include "base/path_service.h"

#include "base/string_util.h"

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

#include "base/threading/thread.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_plugin_host.h"

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

#include "chrome/browser/plugin_updater.h"

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

-#include "chrome/common/chrome_plugin_lib.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/chrome_plugin_lib.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/default_plugin.h"

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

#include "chrome/common/logging_chrome.h"

-#include "chrome/common/notification_type.h"

-#include "chrome/common/notification_service.h"

#include "chrome/common/pepper_plugin_registry.h"

#include "chrome/common/plugin_messages.h"

#include "chrome/common/render_messages.h"

@@ -33,6 +31,8 @@

#include "content/browser/ppapi_plugin_process_host.h"

#include "content/browser/renderer_host/render_process_host.h"

#include "content/browser/renderer_host/render_view_host.h"

+#include "content/common/notification_service.h"

+#include "content/common/notification_type.h"

#include "webkit/plugins/npapi/plugin_constants_win.h"

#include "webkit/plugins/npapi/plugin_list.h"

#include "webkit/plugins/npapi/webplugininfo.h"

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