| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/proxy/proxy_module.h" | 5 #include "ppapi/proxy/proxy_module.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 | 8 |
| 9 namespace ppapi { | 9 namespace ppapi { |
| 10 namespace proxy { | 10 namespace proxy { |
| 11 | 11 |
| 12 ProxyModule::ProxyModule() { | 12 ProxyModule::ProxyModule() { |
| 13 } | 13 } |
| 14 | 14 |
| 15 ProxyModule::~ProxyModule() { | 15 ProxyModule::~ProxyModule() { |
| 16 } | 16 } |
| 17 | 17 |
| 18 // static | 18 // static |
| 19 ProxyModule* ProxyModule::GetInstance() { | 19 ProxyModule* ProxyModule::GetInstance() { |
| 20 return Singleton<ProxyModule>::get(); | 20 return base::Singleton<ProxyModule>::get(); |
| 21 } | 21 } |
| 22 | 22 |
| 23 const std::string& ProxyModule::GetFlashCommandLineArgs() { | 23 const std::string& ProxyModule::GetFlashCommandLineArgs() { |
| 24 return flash_command_line_args_; | 24 return flash_command_line_args_; |
| 25 } | 25 } |
| 26 | 26 |
| 27 void ProxyModule::SetFlashCommandLineArgs(const std::string& args) { | 27 void ProxyModule::SetFlashCommandLineArgs(const std::string& args) { |
| 28 flash_command_line_args_ = args; | 28 flash_command_line_args_ = args; |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // namespace proxy | 31 } // namespace proxy |
| 32 } // namespace ppapi | 32 } // namespace ppapi |
| OLD | NEW |