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

Unified Diff: components/nacl/renderer/plugin/plugin.h

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update #include guards Created 5 years, 11 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: components/nacl/renderer/plugin/plugin.h
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/components/nacl/renderer/plugin/plugin.h
similarity index 93%
rename from ppapi/native_client/src/trusted/plugin/plugin.h
rename to components/nacl/renderer/plugin/plugin.h
index b1855f969965f1fddcc991d474604f1ddca389c0..bc3bde37242f57c5b81fa5b6841e5c06464b4214 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.h
+++ b/components/nacl/renderer/plugin/plugin.h
@@ -6,28 +6,25 @@
// The portable representation of an instance and root scriptable object.
// The PPAPI version of the plugin instantiates a subclass of this class.
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
+#ifndef COMPONENTS_NACL_RENDERER_PLUGIN_PLUGIN_H_
+#define COMPONENTS_NACL_RENDERER_PLUGIN_PLUGIN_H_
#include <stdio.h>
#include <string>
+#include "components/nacl/renderer/plugin/nacl_subprocess.h"
+#include "components/nacl/renderer/plugin/pnacl_coordinator.h"
+#include "components/nacl/renderer/plugin/service_runtime.h"
+#include "components/nacl/renderer/plugin/utility.h"
#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/nacl_scoped_ptr.h"
-
#include "ppapi/c/private/ppb_nacl_private.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/private/uma_private.h"
#include "ppapi/cpp/url_loader.h"
#include "ppapi/cpp/var.h"
#include "ppapi/cpp/view.h"
-
-#include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
-#include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
-#include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
-#include "ppapi/native_client/src/trusted/plugin/utility.h"
-
#include "ppapi/utility/completion_callback_factory.h"
namespace nacl {
@@ -184,4 +181,4 @@ class Plugin : public pp::Instance {
} // namespace plugin
-#endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
+#endif // COMPONENTS_NACL_RENDERER_PLUGIN_PLUGIN_H_

Powered by Google App Engine
This is Rietveld 408576698