| Index: chrome/default_plugin/plugin_impl_mac.mm
 | 
| ===================================================================
 | 
| --- chrome/default_plugin/plugin_impl_mac.mm	(revision 69765)
 | 
| +++ chrome/default_plugin/plugin_impl_mac.mm	(working copy)
 | 
| @@ -17,7 +17,7 @@
 | 
|  #include "grit/webkit_strings.h"
 | 
|  #include "unicode/locid.h"
 | 
|  #include "webkit/glue/webkit_glue.h"
 | 
| -#include "webkit/plugins/npapi/default_plugin_shared.h"
 | 
| +#include "webkit/glue/plugins/default_plugin_shared.h"
 | 
|  
 | 
|  // TODO(thakis): Most methods in this class are stubbed out and need to be
 | 
|  // implemented.
 | 
| @@ -194,6 +194,6 @@
 | 
|    default_plugin::g_browser->getvalue(
 | 
|        instance_,
 | 
|        static_cast<NPNVariable>(
 | 
| -          webkit::npapi::default_plugin::kMissingPluginStatusStart + status),
 | 
| +          default_plugin::kMissingPluginStatusStart + status),
 | 
|        NULL);
 | 
|  }
 | 
| 
 | 
| Property changes on: chrome/default_plugin/plugin_impl_mac.mm
 | 
| ___________________________________________________________________
 | 
| Deleted: svn:mergeinfo
 | 
| 
 | 
| 
 |