diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:48:49 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:48:49 +0000 |
| commit | 85c5b0230b1a9a9d8e02ad6049c31bf55eb5c076 (patch) | |
| tree | a4d8ddd09d0beeffa01b2ad9222698cd914b4717 /o3d/plugin | |
| parent | 5222bb1495ef2e9a6294da8a8f1b9c1dae2e54e4 (diff) | |
| download | chromium_src-85c5b0230b1a9a9d8e02ad6049c31bf55eb5c076.zip chromium_src-85c5b0230b1a9a9d8e02ad6049c31bf55eb5c076.tar.gz chromium_src-85c5b0230b1a9a9d8e02ad6049c31bf55eb5c076.tar.bz2 | |
Reverting 31676.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/cross/o3d_glue.cc | 6 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 2 | ||||
| -rw-r--r-- | o3d/plugin/win/main_win.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc index 075ca5d..f2cfb4f 100644 --- a/o3d/plugin/cross/o3d_glue.cc +++ b/o3d/plugin/cross/o3d_glue.cc @@ -40,9 +40,9 @@ #include "core/cross/renderer.h" #include "core/cross/client_info.h" #include "core/cross/command_buffer/display_window_cb.h" -#include "gpu/np_utils/np_headers.h" -#include "gpu/np_utils/np_object_pointer.h" -#include "gpu/np_utils/np_utils.h" +#include "gpu_plugin/np_utils/np_headers.h" +#include "gpu_plugin/np_utils/np_object_pointer.h" +#include "gpu_plugin/np_utils/np_utils.h" #include "plugin/cross/o3d_glue.h" #include "plugin/cross/config.h" #include "plugin/cross/stream_manager.h" diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index c128c70..10cb1c4 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -50,7 +50,7 @@ '../../v8/tools/gyp/v8.gyp:v8', '../core/core.gyp:o3dCore', '../core/core.gyp:o3dCorePlatform', - '../gpu/gpu.gyp:np_utils', + '../gpu_plugin/gpu_plugin.gyp:np_utils', '../import/archive.gyp:o3dArchive', '../utils/utils.gyp:o3dUtils', '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc index 13cfc12..785e771 100644 --- a/o3d/plugin/win/main_win.cc +++ b/o3d/plugin/win/main_win.cc @@ -54,7 +54,7 @@ #if defined(RENDERER_CB) #include "core/cross/command_buffer/renderer_cb.h" #include "core/cross/command_buffer/display_window_cb.h" -#include "gpu/gpu_plugin/command_buffer.h" +#include "gpu_plugin/command_buffer.h" #endif using glue::_o3d::PluginObject; |