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

Unified Diff: components/nacl/browser/nacl_broker_host_win.cc

Issue 75463005: Move more files from chrome/browser/nacl_host/ to components/nacl/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/browser/nacl_broker_host_win.cc
diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.cc b/components/nacl/browser/nacl_broker_host_win.cc
similarity index 92%
rename from chrome/browser/nacl_host/nacl_broker_host_win.cc
rename to components/nacl/browser/nacl_broker_host_win.cc
index 50764ab5cb7e4d1a036856203a974e489c31a937..16f8ab7de151d6557b92b5f1bbefc0a49eedffc8 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.cc
+++ b/components/nacl/browser/nacl_broker_host_win.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/nacl_host/nacl_broker_host_win.h"
+#include "components/nacl/browser/nacl_broker_host_win.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/path_service.h"
#include "ipc/ipc_switches.h"
-#include "chrome/browser/nacl_host/nacl_broker_service_win.h"
+#include "components/nacl/browser/nacl_broker_service_win.h"
#include "components/nacl/browser/nacl_browser.h"
#include "components/nacl/common/nacl_cmd_line.h"
#include "components/nacl/common/nacl_messages.h"
@@ -37,6 +37,8 @@ class NaClBrokerSandboxedProcessLauncherDelegate
};
} // namespace
+namespace nacl {
+
NaClBrokerHost::NaClBrokerHost() : is_terminating_(false) {
process_.reset(content::BrowserChildProcessHost::Create(
PROCESS_TYPE_NACL_BROKER, this));
@@ -87,7 +89,8 @@ bool NaClBrokerHost::LaunchLoader(const std::string& loader_channel_id) {
void NaClBrokerHost::OnLoaderLaunched(const std::string& loader_channel_id,
base::ProcessHandle handle) {
- NaClBrokerService::GetInstance()->OnLoaderLaunched(loader_channel_id, handle);
+ nacl::NaClBrokerService::GetInstance()->OnLoaderLaunched(
+ loader_channel_id, handle);
}
bool NaClBrokerHost::LaunchDebugExceptionHandler(
@@ -104,7 +107,7 @@ bool NaClBrokerHost::LaunchDebugExceptionHandler(
}
void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) {
- NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
+ nacl::NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
success);
}
@@ -112,3 +115,5 @@ void NaClBrokerHost::StopBroker() {
is_terminating_ = true;
process_->Send(new NaClProcessMsg_StopBroker());
}
+
+} // namespace nacl

Powered by Google App Engine
This is Rietveld 408576698