| Index: content/child/npapi/plugin_instance_mac.mm
|
| ===================================================================
|
| --- content/child/npapi/plugin_instance_mac.mm (revision 0)
|
| +++ content/child/npapi/plugin_instance_mac.mm (working copy)
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "build/build_config.h"
|
| -#include "webkit/plugins/npapi/plugin_instance.h"
|
| +#include "content/child/npapi/plugin_instance.h"
|
|
|
| // When C++ exceptions are disabled, the C++ library defines |try| and
|
| // |catch| so as to allow exception-expecting C++ code to build properly when
|
| @@ -17,8 +17,7 @@
|
| #undef try
|
| #undef catch
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| namespace {
|
|
|
| @@ -104,5 +103,4 @@
|
| instance_->set_currently_handled_event(NULL);
|
| }
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|