| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/common/gpu_plugin.h" | 5 #include "chrome/common/gpu_plugin.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| 10 #include "gpu/gpu_plugin/gpu_plugin.h" | 11 #include "gpu/gpu_plugin/gpu_plugin.h" |
| 11 #include "webkit/glue/plugins/plugin_list.h" | 12 #include "webkit/glue/plugins/plugin_list.h" |
| 12 | 13 |
| 13 #if defined(ENABLE_GPU) | 14 #if defined(ENABLE_GPU) |
| 14 #include "webkit/glue/plugins/plugin_constants_win.h" | 15 #include "webkit/glue/plugins/plugin_constants_win.h" |
| 15 #endif | 16 #endif |
| 16 | 17 |
| 17 namespace chrome { | 18 namespace chrome { |
| 18 | 19 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 35 gpu_plugin::NP_Shutdown | 36 gpu_plugin::NP_Shutdown |
| 36 } | 37 } |
| 37 }; | 38 }; |
| 38 | 39 |
| 39 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableGPUPlugin)) | 40 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableGPUPlugin)) |
| 40 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(kGPUPluginInfo); | 41 NPAPI::PluginList::Singleton()->RegisterInternalPlugin(kGPUPluginInfo); |
| 41 #endif // ENABLE_GPU | 42 #endif // ENABLE_GPU |
| 42 } | 43 } |
| 43 | 44 |
| 44 } // namespace chrome | 45 } // namespace chrome |
| OLD | NEW |