| Index: chrome/common/nacl_delegate.cc
|
| diff --git a/chrome/common/nacl_cmd_line.cc b/chrome/common/nacl_delegate.cc
|
| similarity index 64%
|
| rename from chrome/common/nacl_cmd_line.cc
|
| rename to chrome/common/nacl_delegate.cc
|
| index 2c2fde6c7cb12305db9239c0ec7e991811a30454..d50a316759d9c1dd9946bddb43eccc930561a6b2 100644
|
| --- a/chrome/common/nacl_cmd_line.cc
|
| +++ b/chrome/common/nacl_delegate.cc
|
| @@ -1,15 +1,19 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 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 "components/nacl/common/nacl_delegate.h"
|
| +
|
| +#include "base/base_switches.h"
|
| #include "base/basictypes.h"
|
| #include "base/command_line.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "components/nacl/common/nacl_delegate.h"
|
| +#include "components/nacl/common/nacl_switches.h"
|
| +#include "content/public/common/content_switches.h"
|
|
|
| -namespace nacl {
|
| -
|
| -void CopyNaClCommandLineArguments(CommandLine* cmd_line) {
|
| - const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
|
| +void NaClDelegate::CopyNaClCommandLineArguments(CommandLine* cmd_line) {
|
| + const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
|
|
|
| // Propagate the following switches to the NaCl loader command line (along
|
| // with any associated values) if present in the browser command line.
|
| @@ -34,4 +38,7 @@ void CopyNaClCommandLineArguments(CommandLine* cmd_line) {
|
| arraysize(kSwitchNames));
|
| }
|
|
|
| -} // namespace nacl
|
| +NaClDelegate* GetNaClDelegate() {
|
| + static NaClDelegate* naclDelegate = new NaClDelegate;
|
| + return naclDelegate;
|
| +}
|
|
|