diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 23:54:57 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 23:54:57 +0000 |
| commit | bcb022cc3880f239eccc93c748e30c640787b0dc (patch) | |
| tree | d74860b4309e5125509aa1a2c96dda827f2867bc /o3d/plugin/win/main_win.cc | |
| parent | 8b68b68ec27ff6e220d7bbcf2783933d05c4112e (diff) | |
| download | chromium_src-bcb022cc3880f239eccc93c748e30c640787b0dc.zip chromium_src-bcb022cc3880f239eccc93c748e30c640787b0dc.tar.gz chromium_src-bcb022cc3880f239eccc93c748e30c640787b0dc.tar.bz2 | |
Moved command_buffer and gpu_plugin code out of o3d namespace.
Changed header guard macros in preparation for move to Chrome gpu directory.
Added svn:eol LF property.
Review URL: http://codereview.chromium.org/375004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/win/main_win.cc')
| -rw-r--r-- | o3d/plugin/win/main_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc index 33561c7..30f461a 100644 --- a/o3d/plugin/win/main_win.cc +++ b/o3d/plugin/win/main_win.cc @@ -63,8 +63,8 @@ using o3d::DisplayWindowWindows; using o3d::Event; #if defined(RENDERER_CB) -using o3d::gpu_plugin::CommandBuffer; -using o3d::gpu_plugin::NPObjectPointer; +using gpu_plugin::CommandBuffer; +using gpu_plugin::NPObjectPointer; #endif namespace { @@ -75,7 +75,7 @@ HINSTANCE g_module_instance; // move over to gyp. This is just to avoid having to write scons files for // np_utils. #if defined(RENDERER_CB) -o3d::gpu_plugin::NPBrowser* g_browser; +gpu_plugin::NPBrowser* g_browser; #endif } // namespace anonymous @@ -738,7 +738,7 @@ NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) { HANDLE_CRASHES; #if defined(RENDERER_CB) - g_browser = new o3d::gpu_plugin::NPBrowser(browserFuncs); + g_browser = new gpu_plugin::NPBrowser(browserFuncs); #endif NPError retval = InitializeNPNApi(browserFuncs); |