Skip to content

Commit

Permalink
Move broker related files to components/nacl/broker.
Browse files Browse the repository at this point in the history
This is part of an effort to componentize NaCl code.

BUG=244791

Review URL: https://chromiumcodereview.appspot.com/19585005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213786 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
yael.aharon@intel.com committed Jul 26, 2013
1 parent 1b0ce4c commit 940ef20
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions chrome/nacl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
'../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
],
'sources': [
'nacl/nacl_broker_listener.cc',
'nacl/nacl_broker_listener.h',
'../components/nacl/broker/nacl_broker_listener.cc',
'../components/nacl/broker/nacl_broker_listener.h',
'../components/nacl/common/nacl_debug_exception_handler_win.cc',
],
'include_dirs': [
Expand Down
2 changes: 1 addition & 1 deletion chrome/nacl/nacl_exe_win_64.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include "chrome/app/chrome_breakpad_client.h"
#include "chrome/common/chrome_result_codes.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/nacl/nacl_broker_listener.h"
#include "chrome/nacl/nacl_listener.h"
#include "chrome/nacl/nacl_main_platform_delegate.h"
#include "components/breakpad/breakpad_client.h"
#include "components/nacl/broker/nacl_broker_listener.h"
#include "components/nacl/common/nacl_switches.h"
#include "content/public/app/startup_helper_win.h"
#include "content/public/common/content_switches.h"
Expand Down
4 changes: 4 additions & 0 deletions components/nacl/broker/DEPS
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include_rules = [
"+content/public/app/startup_helper_win.h",
"+sandbox/win/src",
]
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "chrome/nacl/nacl_broker_listener.h"
#include "components/nacl/broker/nacl_broker_listener.h"

#include "base/base_switches.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/path_service.h"
#include "chrome/common/chrome_switches.h"
#include "components/nacl/common/nacl_cmd_line.h"
#include "components/nacl/common/nacl_debug_exception_handler_win.h"
#include "components/nacl/common/nacl_messages.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef CHROME_NACL_NACL_BROKER_LISTENER_H_
#define CHROME_NACL_NACL_BROKER_LISTENER_H_
#ifndef COMPONENTS_NACL_BROKER_NACL_BROKER_LISTENER_H_
#define COMPONENTS_NACL_BROKER_NACL_BROKER_LISTENER_H_

#include "base/memory/scoped_ptr.h"
#include "base/process/process.h"
Expand Down Expand Up @@ -47,4 +47,4 @@ class NaClBrokerListener : public content::SandboxedProcessLauncherDelegate,
DISALLOW_COPY_AND_ASSIGN(NaClBrokerListener);
};

#endif // CHROME_NACL_NACL_BROKER_LISTENER_H_
#endif // COMPONENTS_NACL_BROKER_NACL_BROKER_LISTENER_H_

0 comments on commit 940ef20

Please sign in to comment.